X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=3fd24d8ea0ebde029e262d137dcfaf509b0db5ee;hp=1005609eb16a8ed1a08377c276a7c152c61d22a0;hb=f89300d4264069e50a42c7e26b428957e750b437;hpb=f33a98b1a044c8ac7b12778cbca6c4a124875e4a

diff --git a/source/font.cpp b/source/font.cpp
index 1005609e..3fd24d8e 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
@@ -42,7 +44,7 @@ void Font::add_glyph(const Glyph &g)
 
 void Font::set_kerning(unsigned l, unsigned r, float d)
 {
-	kerning[KerningKey(l, r)] = d;
+	kerning[CodePair(l, r)] = d;
 }
 
 float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
@@ -74,11 +76,19 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 {
 	MatrixStack::Push push_mtx(bld.matrix());
 
-	bld.begin(QUADS);
 	unsigned prev = 0;
-	for(string::const_iterator i=str.begin(); i!=str.end();)
+	unsigned next = 0;
+	for(string::const_iterator i=str.begin(); (next || i!=str.end());)
 	{
-		unsigned c = dec.decode_char(str, i);
+		unsigned c = (next ? next : dec.decode_char(str, i));
+		next = (i!=str.end() ? dec.decode_char(str, i) : 0);
+
+		if(unsigned lig = get_ligature(c, next))
+		{
+			c = lig;
+			next = 0;
+		}
+
 		GlyphMap::const_iterator j = glyphs.find(c);
 		if(j==glyphs.end())
 			continue;
@@ -86,22 +96,23 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 		if(prev)
 			bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
 
-		create_glyph_vertices(j->second, bld);
+		create_glyph_quad(j->second, bld);
 		prev = c;
 	}
-	bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
+void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &bld) const
 {
+	bld.begin(TRIANGLE_STRIP);
+	bld.texcoord(glyph.x1, glyph.y2);
+	bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
 	bld.texcoord(glyph.x1, glyph.y1);
 	bld.vertex(glyph.off_x, glyph.off_y);
-	bld.texcoord(glyph.x2, glyph.y1);
-	bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
 	bld.texcoord(glyph.x2, glyph.y2);
 	bld.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-	bld.texcoord(glyph.x1, glyph.y2);
-	bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
+	bld.texcoord(glyph.x2, glyph.y1);
+	bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
+	bld.end();
 }
 
 float Font::get_glyph_advance(unsigned code, unsigned next) const
@@ -114,7 +125,7 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
 
 	if(next)
 	{
-		KerningMap::const_iterator j = kerning.find(KerningKey(code, next));
+		KerningMap::const_iterator j = kerning.find(CodePair(code, next));
 		if(j!=kerning.end())
 			advance += j->second;
 	}
@@ -122,6 +133,12 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
 	return advance;
 }
 
+unsigned Font::get_ligature(unsigned code, unsigned next) const
+{
+	LigatureMap::const_iterator i = ligatures.find(CodePair(code, next));
+	return (i!=ligatures.end() ? i->second : 0);
+}
+
 
 Font::Loader::Loader(Font &f):
 	DataFile::CollectionObjectLoader<Font>(f, 0)
@@ -139,11 +156,14 @@ 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("ligature",    &Loader::ligature);
+	add("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)
@@ -156,7 +176,12 @@ void Font::Loader::glyph(unsigned c)
 
 void Font::Loader::kerning(unsigned l, unsigned r, float d)
 {
-	obj.kerning[KerningKey(l, r)] = d;
+	obj.kerning[CodePair(l, r)] = d;
+}
+
+void Font::Loader::ligature(unsigned l, unsigned r, unsigned g)
+{
+	obj.ligatures[CodePair(l, r)] = g;
 }
 
 void Font::Loader::texture()