a

Author: TakWolf

src/sfnttools/font.py

@@ -8,7 +8,7 @@
 from sfnttools.internal.stream import Stream
 from sfnttools.woff.headers import WoffHeader
 from sfnttools.woff.reader import WoffReader
-from sfnttools.woff2.headers import Woff2Header, Woff2CollectionFontEntry
+from sfnttools.woff2.headers import Woff2Header
 from sfnttools.woff2.reader import Woff2Reader
 from sfnttools.xtf.headers import TableDirectory, TtcHeader
 from sfnttools.xtf.reader import XtfReader
@@ -46,16 +46,19 @@ def parse(
             sfnt_version, tables = reader.parse_font()
             return SfntFont(sfnt_version, tables)
         elif tag == SfntFileTag.WOFF2:
-            header = Woff2Header.parse(stream)
-            if header.collection_header is None:
-                font_entry = Woff2CollectionFontEntry(
-                    SfntVersion(header.flavor),
-                    [i for i in range(len(header.table_directory_entries))],
-                )
-            else:
+            stream.seek(4)
+            flavor = stream.read_tag()
+            stream.seek(0)
+            if flavor == SfntFileTag.TTCF:
                 if font_index is None:
                     raise SfntError(f'must specify a font index in font collection')
+                header = Woff2Header.parse(stream)
                 font_entry = header.collection_header.font_entries[font_index]
+            elif flavor in [*SfntVersion]:
+                header = Woff2Header.parse(stream)
+                font_entry = header.simulate_single_font_entry()
+            else:
+                raise SfntError('unsupported SFNT font')
             decompressed_stream = Stream(BytesIO(header.decompressed_data))
 
             reader = Woff2Reader(decompressed_stream, header, font_entry, False, None)

src/sfnttools/woff2/headers.py

@@ -284,6 +284,11 @@ def __init__(
         self.collection_header = collection_header
         self.decompressed_data = decompressed_data
 
+    def simulate_single_font_entry(self):
+        sfnt_version = SfntVersion(self.flavor)
+        indices = [i for i in range(len(self.table_directory_entries))]
+        return Woff2CollectionFontEntry(sfnt_version, indices)
+
     def dump(self, stream: Stream):
         compressed_data = brotli.compress(self.decompressed_data, mode=brotli.MODE_FONT)
         stream.write_tag(SfntFileTag.WOFF2)