4 files changed, 63 insertions, 153 deletions

diff --git a/src/fontpack.c b/src/fontpack.c
index 96d973f7..ec62702f 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/fileinfo.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/ptrarray.h>
+#include <the_Foundation/regexp.h>
 #include <the_Foundation/string.h>
 #include <the_Foundation/stringlist.h>
 #include <the_Foundation/toml.h>
@@ -65,6 +66,7 @@ iDefineObjectConstruction(FontFile)
 
 void init_FontFile(iFontFile *d) {
     init_String(&d->id);
+    d->colIndex = 0;
     d->style = regular_FontStyle;
     init_Block(&d->sourceData, 0);
     iZap(d->stbInfo);
@@ -77,15 +79,17 @@ void init_FontFile(iFontFile *d) {
 
 static void load_FontFile_(iFontFile *d, const iBlock *data) {
     set_Block(&d->sourceData, data);
-    stbtt_InitFont(&d->stbInfo, constData_Block(&d->sourceData), 0);
+    const size_t offset = stbtt_GetFontOffsetForIndex(constData_Block(&d->sourceData),
+                                                      d->colIndex);
+    stbtt_InitFont(&d->stbInfo, constData_Block(data), offset);
     /* Basic metrics. */
     stbtt_GetFontVMetrics(&d->stbInfo, &d->ascent, &d->descent, NULL);
     stbtt_GetCodepointHMetrics(&d->stbInfo, 'M', &d->emAdvance, NULL);
 #if defined(LAGRANGE_ENABLE_HARFBUZZ)
     /* HarfBuzz will read the font data. */
-    d->hbBlob = hb_blob_create(constData_Block(&d->sourceData), size_Block(&d->sourceData),
+    d->hbBlob = hb_blob_create(constData_Block(data), size_Block(&d->sourceData),
                                HB_MEMORY_MODE_READONLY, NULL, NULL);
-    d->hbFace = hb_face_create(d->hbBlob, 0);
+    d->hbFace = hb_face_create(d->hbBlob, d->colIndex);
     d->hbFont = hb_font_create(d->hbFace);
 #endif
 }
@@ -173,6 +177,7 @@ struct Impl_Fonts {
     iPtrArray packs;
     iObjectList *files;
     iPtrArray specOrder; /* specs sorted by priority */
+    iRegExp *indexPattern; /* collection index filename suffix */
 };
 
 static iFonts fonts_;
@@ -371,22 +376,40 @@ void handleIniKeyValue_FontPack_(void *context, const iString *table, const iStr
     else if (value->type == string_TomlType) {
         iForIndices(i, styles_) {
             if (!cmp_String(key, styles_[i]) && !d->loadSpec->styles[i]) {
+                iBeginCollect();
                 iFontFile *ff = NULL;
-                iString *fontFileId = concat_Path(d->loadPath, value->value.string);
-                if (!(ff = findFile_Fonts_(&fonts_, fontFileId))) {
-                    iBlock *data = readFile_FontPack_(d, value->value.string);
-                    if (data) {
-                        ff = new_FontFile();
-                        set_String(&ff->id, fontFileId);
-                        load_FontFile_(ff, data);
-                        pushBack_ObjectList(fonts_.files, ff); /* centralized ownership */
-                        iRelease(ff);
-                        delete_Block(data);
-//                        printf("[FontPack] loaded file: %s\n", cstr_String(fontFileId));
+                iString *cleanPath = collect_String(copy_String(value->value.string));
+                int colIndex = 0;
+                /* Remove the collection index from the path. */ {
+                    iRegExpMatch m;
+                    init_RegExpMatch(&m);
+                    if (matchString_RegExp(fonts_.indexPattern, cleanPath, &m)) {
+                        colIndex = toInt_String(collect_String(captured_RegExpMatch(&m, 1)));
+                        removeEnd_String(cleanPath, size_Range(&m.range));
                     }
                 }
+                iString *fontFileId = concat_Path(d->loadPath, cleanPath);
+                /* FontFiles share source data blocks. The entire FontFiles can be reused, too, 
+                   if have the same collection index is in use. */
+                iBlock *data = NULL;
+                ff = findFile_Fonts_(&fonts_, fontFileId);
+                if (ff) {
+                    data = &ff->sourceData;
+                }
+                if (!ff || ff->colIndex != colIndex) {
+                    if (!data) {
+                        data = collect_Block(readFile_FontPack_(d, cleanPath));
+                    }
+                    ff = new_FontFile();
+                    set_String(&ff->id, fontFileId);
+                    ff->colIndex = colIndex;
+                    load_FontFile_(ff, data);
+                    pushBack_ObjectList(fonts_.files, ff); /* centralized ownership */
+                    iRelease(ff);
+                }
                 d->loadSpec->styles[i] = ref_Object(ff);
                 delete_String(fontFileId);
+                iEndCollect();
                 break;
             }
         }
@@ -528,6 +551,7 @@ static const iString *userFontsDirectory_Fonts_(const iFonts *d) {
 
 void init_Fonts(const char *userDir) {
     iFonts *d = &fonts_;
+    d->indexPattern = new_RegExp(":([0-9]+)$", 0);    
     initCStr_String(&d->userDir, userDir);
     const iString *userFontsDir = userFontsDirectory_Fonts_(d);
     makeDirs_Path(userFontsDir);
@@ -659,6 +683,7 @@ void deinit_Fonts(void) {
     deinit_PtrArray(&d->specOrder);
     deinit_PtrArray(&d->packs);
     iRelease(d->files);
+    iRelease(d->indexPattern);
     deinit_String(&d->userDir);
 }
 
@@ -706,18 +731,27 @@ iString *infoText_FontPack(const iFontPack *d) {
         const iFontSpec *spec = i.ptr;
         pushBack_StringList(names, &spec->name);
         iForIndices(j, spec->styles) {
-            insert_PtrSet(uniqueFiles, spec->styles[j]);
+            insert_PtrSet(uniqueFiles, spec->styles[j]->sourceData.i);
         }
     }
     iConstForEach(PtrSet, j, uniqueFiles) {
-        sizeInBytes += size_Block(&((const iFontFile *) *j.value)->sourceData);
-    }
-    appendFormat_String(str, "%.1f ${mb} (%s) \u2014 %s\n",
-                        sizeInBytes / 1.0e6,
-                        formatCStrs_Lang("num.files.n", size_PtrSet(uniqueFiles)),
-//                        formatCStrs_Lang("num.fonts.n", size_StringList(names)),
-                        cstrCollect_String(joinCStr_StringList(names, ", ")),
-                        d->version);
+        sizeInBytes += ((const iBlockData *) *j.value)->size;
+    }
+    appendFormat_String(str, "%.1f ${mb} ", sizeInBytes / 1.0e6);
+    if (size_PtrSet(uniqueFiles) > 1 || size_StringList(names) > 1) {
+        appendFormat_String(str, "(");
+        if (size_PtrSet(uniqueFiles) > 1) {
+            appendCStr_String(str, formatCStrs_Lang("num.files.n", size_PtrSet(uniqueFiles)));
+        }
+        if (size_StringList(names) > 1) {
+            if (!endsWith_String(str, "(")) {
+                appendCStr_String(str, ", ");
+            }
+            appendCStr_String(str, formatCStrs_Lang("num.fonts.n", size_StringList(names)));
+        }
+        appendFormat_String(str, ")");
+    }
+    appendFormat_String(str, " \u2014 %s\n", cstrCollect_String(joinCStr_StringList(names, ", ")));
     if (isInstalled && installedVersion != d->version) {
         appendCStr_String(str, format_Lang("${fontpack.meta.version}\n", d->version));
     }
diff --git a/src/fontpack.h b/src/fontpack.h
index d86de945..aa6f2b9f 100644
--- a/src/fontpack.h
+++ b/src/fontpack.h
@@ -78,6 +78,7 @@ iDeclareObjectConstruction(FontFile)
 struct Impl_FontFile {
     iObject         object; /* reference-counted */
     iString         id; /* for detecting when the same file is used in many places */
+    int             colIndex;
     enum iFontStyle style;
     iBlock          sourceData;
     stbtt_fontinfo  stbInfo;
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 0c24302f..444520c6 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -139,9 +139,9 @@ struct Impl_GmRun {
         uint32_t isRTL     : 1;
         uint32_t color     : 7; /* see max_ColorId */
 
-        uint32_t font      : 13;
+        uint32_t font      : 14;
         uint32_t mediaType : 3; /* note: max_MediaType means preformatted block */
-        uint32_t mediaId   : 12; /* zero if not an image */
+        uint32_t mediaId   : 11; /* zero if not an image */
         uint32_t lineType  : 3;
         uint32_t isLede    : 1;
     };
diff --git a/src/ui/text.c b/src/ui/text.c
index 436ec208..09c01d46 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -318,134 +318,6 @@ static const iFontSpec *tryFindSpec_(enum iPrefsString ps, const char *fallback)
 }
 
 static void initFonts_Text_(iText *d) {
-#if 0
-    const iBlock *regularFont   = &fontNunitoRegular_Embedded;
-    const iBlock *boldFont      = &fontNunitoBold_Embedded;
-    const iBlock *italicFont    = &fontNunitoLightItalic_Embedded;
-    const iBlock *h12Font       = &fontNunitoExtraBold_Embedded;
-    const iBlock *h3Font        = &fontNunitoRegular_Embedded;
-    const iBlock *lightFont     = &fontNunitoExtraLight_Embedded;
-    float         scaling       = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
-    float         italicScaling = 1.0f;
-    float         lightScaling  = 1.0f;
-    float         h123Scaling   = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
-    if (d->contentFont == firaSans_TextFont) {
-        regularFont = &fontFiraSansRegular_Embedded;
-        boldFont    = &fontFiraSansSemiBold_Embedded;
-        lightFont   = &fontFiraSansLight_Embedded;
-        italicFont  = &fontFiraSansItalic_Embedded;
-        scaling     = italicScaling = lightScaling = 0.85f;
-    }
-    else if (d->contentFont == tinos_TextFont) {
-        regularFont = &fontTinosRegular_Embedded;
-        boldFont    = &fontTinosBold_Embedded;
-        lightFont   = &fontLiterataExtraLightopsz18_Embedded;
-        italicFont  = &fontTinosItalic_Embedded;
-        scaling      = italicScaling = 0.85f;
-    }
-    else if (d->contentFont == literata_TextFont) {
-        regularFont = &fontLiterataRegularopsz14_Embedded;
-        boldFont    = &fontLiterataBoldopsz36_Embedded;
-        italicFont  = &fontLiterataLightItalicopsz10_Embedded;
-        lightFont   = &fontLiterataExtraLightopsz18_Embedded;
-    }
-    else if (d->contentFont == sourceSans3_TextFont) {
-        regularFont = &fontSourceSans3Regular_Embedded;
-        boldFont    = &fontSourceSans3Semibold_Embedded;
-        italicFont  = &fontSourceSans3It_Embedded;
-        lightFont   = &fontSourceSans3ExtraLight_Embedded;
-    }
-    else if (d->contentFont == iosevka_TextFont) {
-        regularFont = &fontIosevkaTermExtended_Embedded;
-        boldFont    = &fontIosevkaTermExtended_Embedded;
-        italicFont  = &fontIosevkaTermExtended_Embedded;
-        lightFont   = &fontIosevkaTermExtended_Embedded;
-        scaling     = italicScaling = lightScaling = 0.866f;
-    }
-    if (d->headingFont == firaSans_TextFont) {
-        h12Font     = &fontFiraSansBold_Embedded;
-        h3Font      = &fontFiraSansRegular_Embedded;
-        h123Scaling = 0.85f;
-    }
-    else if (d->headingFont == tinos_TextFont) {
-        h12Font = &fontTinosBold_Embedded;
-        h3Font  = &fontTinosRegular_Embedded;
-        h123Scaling = 0.85f;
-    }
-    else if (d->headingFont == literata_TextFont) {
-        h12Font = &fontLiterataBoldopsz36_Embedded;
-        h3Font  = &fontLiterataRegularopsz14_Embedded;
-    }
-    else if (d->headingFont == sourceSans3_TextFont) {
-        h12Font = &fontSourceSans3Bold_Embedded;
-        h3Font = &fontSourceSans3Regular_Embedded;
-    }
-    else if (d->headingFont == iosevka_TextFont) {
-        h12Font = &fontIosevkaTermExtended_Embedded;
-        h3Font  = &fontIosevkaTermExtended_Embedded;
-    }
-    const struct {
-        const iFontFile *fontFile;
-        int size; /* pixels */
-//        float scaling;
-        enum iFontSize sizeId;
-        /* UI sizes: 1.0, 1.125, 1.333, 1.666 */
-        /* Content sizes: smallmono, mono, 1.0, 1.2, 1.333, 1.666, 2.0 */
-    } fontData[max_FontId] = {
-        /* UI fonts: normal weight */
-        { &fontSourceSans3Regular_Embedded,   uiSize,               1.0f, uiNormal_FontSize },
-        { &fontSourceSans3Regular_Embedded,   uiSize * 1.125f,      1.0f, uiMedium_FontSize },
-        { &fontSourceSans3Regular_Embedded,   uiSize * 1.333f,      1.0f, uiBig_FontSize },
-        { &fontSourceSans3Regular_Embedded,   uiSize * 1.666f,      1.0f, uiLarge_FontSize },
-        { &fontSourceSans3Semibold_Embedded,  uiSize * 0.800f,      1.0f, uiTiny_FontSize },
-        { &fontSourceSans3Regular_Embedded,   uiSize * 0.900f,      1.0f, uiSmall_FontSize },
-        /* UI fonts: bold weight */
-        { &fontSourceSans3Bold_Embedded,      uiSize,               1.0f, uiNormal_FontSize },
-        { &fontSourceSans3Bold_Embedded,      uiSize * 1.125f,      1.0f, uiMedium_FontSize },
-        { &fontSourceSans3Bold_Embedded,      uiSize * 1.333f,      1.0f, uiBig_FontSize },
-        { &fontSourceSans3Bold_Embedded,      uiSize * 1.666f,      1.0f, uiLarge_FontSize },
-        /* content fonts */
-        { regularFont,                        textSize,             scaling,      contentRegular_FontSize },
-        { boldFont,                           textSize,             scaling,      contentRegular_FontSize },
-        { italicFont,                         textSize,             italicScaling,contentRegular_FontSize },
-        { regularFont,                        textSize * 1.200f,    scaling,      contentMedium_FontSize },
-        { h3Font,                             textSize * 1.333f,    h123Scaling,  contentBig_FontSize },
-        { h12Font,                            textSize * 1.666f,    h123Scaling,  contentLarge_FontSize },
-        { lightFont,                          textSize * 1.666f,    lightScaling, contentLarge_FontSize },
-        { h12Font,                            textSize * 2.000f,    h123Scaling,  contentHuge_FontSize },
-        { &fontIosevkaTermExtended_Embedded,  smallMonoSize,        1.0f,         contentMonoSmall_FontSize },
-        { &fontIosevkaTermExtended_Embedded,  monoSize,             1.0f,         contentMono_FontSize },
-        /* extra content fonts */
-        { &fontSourceSans3Regular_Embedded,   textSize,             scaling, contentRegular_FontSize },
-        { &fontSourceSans3Regular_Embedded,   textSize * 0.80f,     scaling, contentRegular_FontSize },
-        /* symbols and scripts */
-#define DEFINE_FONT_SET(data, glyphScale) \
-        { (data), uiSize * 0.800f,   glyphScale, uiTiny_FontSize }, \
-        { (data), uiSize * 0.900f,   glyphScale, uiSmall_FontSize }, \
-        { (data), uiSize,            glyphScale, uiNormal_FontSize }, \
-        { (data), uiSize * 1.125f,   glyphScale, uiMedium_FontSize }, \
-        { (data), uiSize * 1.333f,   glyphScale, uiBig_FontSize }, \
-        { (data), uiSize * 1.666f,   glyphScale, uiLarge_FontSize }, \
-        { (data), textSize,          glyphScale, contentRegular_FontSize }, \
-        { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
-        { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
-        { (data), textSize * 1.666f, glyphScale, contentLarge_FontSize }, \
-        { (data), textSize * 2.000f, glyphScale, contentHuge_FontSize }, \
-        { (data), smallMonoSize,     glyphScale, contentMonoSmall_FontSize }, \
-        { (data), monoSize,          glyphScale, contentMono_FontSize }
-        DEFINE_FONT_SET(userFont_ ? userFont_ : &fontIosevkaTermExtended_Embedded, 1.0f),
-        DEFINE_FONT_SET(&fontIosevkaTermExtended_Embedded, 0.866f),
-        DEFINE_FONT_SET(&fontNotoSansSymbolsRegular_Embedded, 2.0f),
-        DEFINE_FONT_SET(&fontNotoSansSymbols2Regular_Embedded, 1.45f),
-        DEFINE_FONT_SET(&fontSmolEmojiRegular_Embedded, 1.0f),
-        DEFINE_FONT_SET(&fontNotoEmojiRegular_Embedded, 1.10f),
-        DEFINE_FONT_SET(&fontNotoSansJPRegular_Embedded, 1.0f),
-        DEFINE_FONT_SET(&fontNotoSansSCRegular_Embedded, 1.0f),
-        DEFINE_FONT_SET(&fontNanumGothicRegular_Embedded, 1.0f), /* TODO: should use Noto Sans here, too */
-        DEFINE_FONT_SET(&fontNotoSansArabicUIRegular_Embedded, 1.0f),
-//        DEFINE_FONT_SET(&fontScheherazadeNewRegular_Embedded, 1.0f),
-    };
-#endif
     /* The `fonts` array has precomputed scaling factors and other parameters in all sizes
        and styles for each available font. Indices to `fonts` act as font runtime IDs. */
     /* First the mandatory fonts. */
@@ -465,6 +337,9 @@ static void initFonts_Text_(iText *d) {
             setupFontVariants_Text_(d, spec, fontId);
         }
     }
+#if !defined (NDEBUG)
+    printf("[Text] %zu fonts ready\n", size_Array(&d->fonts));
+#endif
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }