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
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
void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
{
- MatrixStack::Push push_mtx(bld.matrix());
+ VertexBuilder::PushMatrix push_mtx(bld);
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;
if(prev)
- bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
+ bld.transform(Matrix::translation(get_glyph_advance(prev, c), 0, 0));
create_glyph_quad(j->second, bld);
prev = c;
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;
}
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::Glyph::Glyph():
+ code(0),
+ x1(0),
+ y1(0),
+ x2(1),
+ y2(1),
+ w(1),
+ h(1),
+ off_x(0),
+ off_y(0),
+ advance(1)
+{ }
+
Font::Loader::Loader(Font &f):
DataFile::CollectionObjectLoader<Font>(f, 0)
{
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)
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()