1 files changed, 11 insertions, 5 deletions

diff --git a/src/fontpack.c b/src/fontpack.c
index bbf1833e..79f35526 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -21,7 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
-#include "embedded.h"
+#include "resources.h"
 #include "ui/window.h"
 #include "app.h"
 
@@ -79,6 +79,15 @@ void init_FontFile(iFontFile *d) {
 
 static void load_FontFile_(iFontFile *d, const iBlock *data) {
     set_Block(&d->sourceData, data);
+#if 0
+    /* Count the number of available fonts. */
+    for (int i = 0; ; i++) {
+        if (stbtt_GetFontOffsetForIndex(constData_Block(&d->sourceData), i) < 0) {
+            printf("%s: contains %d fonts\n", cstr_String(&d->id), i);
+            break;
+        }
+    }
+#endif
     const size_t offset = stbtt_GetFontOffsetForIndex(constData_Block(&d->sourceData),
                                                       d->colIndex);
     stbtt_InitFont(&d->stbInfo, constData_Block(data), offset);
@@ -581,11 +590,8 @@ void init_Fonts(const char *userDir) {
     /* Load the required fonts. */ {
         iFontPack *pack = new_FontPack();
         setCStr_String(&pack->id, "default");
-        iArchive *arch = new_Archive();
         setReadOnly_FontPack(pack, iTrue);
-        openData_Archive(arch, &fontpackDefault_Embedded);
-        loadArchive_FontPack(pack, arch); /* should never fail if we've made it this far */
-        iRelease(arch);
+        loadArchive_FontPack(pack, archive_Resources()); /* should never fail if we've made it this far */
         pushBack_PtrArray(&d->packs, pack);
     }
     /* Find and load .fontpack files in known locations. */ {