Custom font matching and font sources

Implement a simple font sorter (FontSelector) and an interface to deal
with multiple font sources (FontProvider). Unfinished business,
but works for the most part. Currently the only implemented FontProvider
uses fontconfig.

1 files changed, 5 insertions, 5 deletions

diff --git a/libass/ass_font.h b/libass/ass_font.h
index f3c3f8e..9ccc83a 100644
--- a/libass/ass_font.h
+++ b/libass/ass_font.h
@@ -26,6 +26,7 @@
 
 #include "ass.h"
 #include "ass_types.h"
+#include "ass_fontselect.h"
 
 #define VERTICAL_LOWER_BOUND 0x02f1
 
@@ -39,7 +40,6 @@ typedef struct {
     char *family;
     unsigned bold;
     unsigned italic;
-    int treat_family_as_pattern;
     int vertical;               // @font vertical layout
 } ASS_FontDesc;
 
@@ -58,7 +58,7 @@ typedef struct {
 #include "ass_cache.h"
 
 ASS_Font *ass_font_new(Cache *font_cache, ASS_Library *library,
-                       FT_Library ftlibrary, void *fc_priv,
+                       FT_Library ftlibrary, ASS_FontSelector *fontsel,
                        ASS_FontDesc *desc);
 void ass_font_set_transform(ASS_Font *font, double scale_x,
                             double scale_y, FT_Vector *v);
@@ -66,10 +66,10 @@ void ass_face_set_size(FT_Face face, double size);
 void ass_font_set_size(ASS_Font *font, double size);
 void ass_font_get_asc_desc(ASS_Font *font, uint32_t ch, int *asc,
                            int *desc);
-int ass_font_get_index(void *fcpriv, ASS_Font *font, uint32_t symbol,
-                       int *face_index, int *glyph_index);
+int ass_font_get_index(ASS_FontSelector *fontsel, ASS_Font *font,
+                       uint32_t symbol, int *face_index, int *glyph_index);
 uint32_t ass_font_index_magic(FT_Face face, uint32_t symbol);
-FT_Glyph ass_font_get_glyph(void *fontconfig_priv, ASS_Font *font,
+FT_Glyph ass_font_get_glyph(ASS_Font *font,
                             uint32_t ch, int face_index, int index,
                             ASS_Hinting hinting, int deco);
 FT_Vector ass_font_get_kerning(ASS_Font *font, uint32_t c1, uint32_t c2);