Improve TTF writer with multi-compound characters

 # Changelog
 # Changelog
 
 
+## 3.10.5
+
+- Improve TTF writer with multi-compound characters
+
 ## 3.10.4
 ## 3.10.4
 
 
 - Fix Deprecation warning message
 - Fix Deprecation warning message

@@ -67,43 +67,56 @@ class TtfWriter {
     final tablesLength = <String, int>{};
     final tablesLength = <String, int>{};
 
 
     // Create the glyphs table
     // Create the glyphs table
-    final glyphsInfo = <TtfGlyphInfo>[];
+    final glyphsMap = <int, TtfGlyphInfo>{};
+    final charMap = <int, int>{};
+    final overflow = <int>{};
     final compounds = <int, int>{};
     final compounds = <int, int>{};
 
 
-    for (var index = 0; index < chars.length; index++) {
-      if (chars[index] == 32) {
+    for (final char in chars) {
+      if (char == 32) {
         final glyph = TtfGlyphInfo(32, Uint8List(0), const <int>[]);
         final glyph = TtfGlyphInfo(32, Uint8List(0), const <int>[]);
-        glyphsInfo.add(glyph);
+        glyphsMap[glyph.index] = glyph;
+        charMap[char] = glyph.index;
         continue;
         continue;
       }
       }
 
 
-      final glyphIndex = ttf.charToGlyphIndexMap[chars[index]] ?? 0;
+      final glyphIndex = ttf.charToGlyphIndexMap[char] ?? 0;
       if (glyphIndex >= ttf.glyphOffsets.length) {
       if (glyphIndex >= ttf.glyphOffsets.length) {
+        assert(true, '$glyphIndex not in the font');
         continue;
         continue;
       }
       }
 
 
-      final glyph = ttf.readGlyph(glyphIndex).copy();
-      for (final g in glyph.compounds) {
-        compounds[g] = -1;
+      void addGlyph(glyphIndex) {
+        final glyph = ttf.readGlyph(glyphIndex).copy();
+        for (final g in glyph.compounds) {
+          compounds[g] = -1;
+          overflow.add(g);
+          addGlyph(g);
+        }
+        glyphsMap[glyph.index] = glyph;
       }
       }
-      glyphsInfo.add(glyph);
+
+      charMap[char] = glyphIndex;
+      addGlyph(glyphIndex);
     }
     }
 
 
-    // Add compound glyphs
-    for (final compound in compounds.keys) {
-      final index = glyphsInfo.firstWhere(
-        (TtfGlyphInfo glyph) => glyph.index == compound,
-        orElse: () {
-          final glyph = ttf.readGlyph(compound);
-          assert(glyph.compounds.isEmpty, 'This is not a simple glyph');
-          glyphsInfo.add(glyph);
+    final glyphsInfo = <TtfGlyphInfo>[];
+
+    for (final char in chars) {
+      final glyphsIndex = charMap[char]!;
+      print('$char $glyphsIndex $glyphsMap $charMap ${ttf.fontName}');
+      glyphsInfo.add(glyphsMap[glyphsIndex] ?? glyphsMap.values.first);
+      glyphsMap.remove(glyphsIndex);
+    }
 
 
-          return glyph;
-        },
-      );
+    glyphsInfo.addAll(glyphsMap.values);
 
 
+    // Add compound glyphs
+    for (final compound in compounds.keys) {
+      final index = glyphsInfo
+          .firstWhere((TtfGlyphInfo glyph) => glyph.index == compound);
       compounds[compound] = glyphsInfo.indexOf(index);
       compounds[compound] = glyphsInfo.indexOf(index);
-      assert(compounds[compound]! >= 0, 'Unable to find the glyph');
+      assert((compounds[compound] ?? 0) >= 0, 'Unable to find the glyph');
     }
     }
 
 
     // update compound indices
     // update compound indices

@@ -6,7 +6,7 @@ issue_tracker: https://github.com/DavBfr/dart_pdf/issues
 screenshots:
 screenshots:
   - description: 'Example of a generated document'
   - description: 'Example of a generated document'
     path: example.jpg
     path: example.jpg
-version: 3.10.4
+version: 3.10.5
 
 
 environment:
 environment:
   sdk: ">=2.18.0 <4.0.0"
   sdk: ">=2.18.0 <4.0.0"