X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=54631926e4e1b3ae22da55afff111450fc9719e0;hp=6780f5fa8679f2ab73df72902d79e8d729b11a55;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=6327ae3d1f8a976f839ce333500c1643f9965fca

diff --git a/source/font.cpp b/source/font.cpp
index 6780f5fa..54631926 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -15,7 +15,9 @@ namespace GL {
 Font::Font():
 	native_size(1),
 	ascent(1),
-	descent(0)
+	descent(0),
+	cap_height(1),
+	x_height(0.5)
 { }
 
 // Avoid synthesizing ~RefPtr in files including font.h
@@ -139,11 +141,13 @@ void Font::Loader::init()
 {
 	add("native_size", &Font::native_size);
 	add("ascent",      &Font::ascent);
+	add("cap_height",  &Font::cap_height);
 	add("descent",     &Font::descent);
 	add("texture",     &Loader::texture);
 	add("texture",     &Loader::texture_ref);
 	add("glyph",       &Loader::glyph);
 	add("kerning",     &Loader::kerning);
+	add("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)