X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/e10118c4c2fedf370daf2f1cee41f69097d7a60f..b5232689b6acadf75a2663aa386cc4685d1139a3:/paper.h diff --git a/paper.h b/paper.h index b0ea032..9bea29d 100644 --- a/paper.h +++ b/paper.h @@ -14,6 +14,7 @@ typedef struct document_Tag document; typedef struct kern_pair_Tag kern_pair; +typedef struct ligature_Tag ligature; typedef struct font_info_Tag font_info; typedef struct font_data_Tag font_data; typedef struct font_encoding_Tag font_encoding; @@ -51,6 +52,13 @@ struct kern_pair_Tag { }; /* + * ... and this one represents a ligature. + */ +struct ligature_Tag { + unsigned short left, right, lig; +}; + +/* * This data structure holds static information about a font that doesn't * depend on the particular document. It gets generated when the font's * metrics are read in. @@ -88,6 +96,8 @@ struct font_info_Tag { unsigned short *glyphsbyname; /* A tree of kern_pairs */ tree234 *kerns; + /* ... and one of ligatures */ + tree234 *ligs; /* * For reasonably speedy lookup, we set up a 65536-element * table representing the Unicode BMP (I can conveniently @@ -363,8 +373,9 @@ struct outline_element_Tag { * Functions exported from bk_paper.c */ int kern_cmp(void *, void *); /* use when setting up kern_pairs */ +int lig_cmp(void *, void *); /* use when setting up ligatures */ void font_index_glyphs(font_info *fi); -int find_glyph(font_info *fi, char const *name); +int find_glyph(font_info const *fi, char const *name); /*