X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.h;h=4eaed9635361ecca51ae5604b84c3c0d533c1109;hp=bb8bd0a29a1c5c45612d4def0476824817e602a6;hb=20af6dd2f04caa224d8cae00befc97d010a1ed08;hpb=a1eb8711ba225bb4423868c50369ad5592465171

diff --git a/source/font.h b/source/font.h
index bb8bd0a2..4eaed963 100644
--- a/source/font.h
+++ b/source/font.h
@@ -60,6 +60,8 @@ private:
 	float native_size;
 	float ascent;
 	float descent;
+	float cap_height;
+	float x_height;
 	GlyphMap glyphs;
 	KerningMap kerning;
 
@@ -81,6 +83,8 @@ public:
 
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
+	float get_cap_height() const { return cap_height; }
+	float get_x_height() const { return x_height; }
 
 	/** Returns the width of a string, in multiples of the font size.  Scale the
 	result according to the size used in rendering. */
@@ -127,7 +131,7 @@ public:
 	{ return build_string<StringCodec::Utf8>(str, pb); }
 
 private:
-	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
+	void create_glyph_quad(const Glyph &, PrimitiveBuilder &) const;
 	float get_glyph_advance(unsigned, unsigned = 0) const;
 };