diff --git a/src/glsl_glyphs/reader.py b/src/glsl_glyphs/reader.py index a73b75f..8186f14 100644 --- a/src/glsl_glyphs/reader.py +++ b/src/glsl_glyphs/reader.py @@ -39,10 +39,14 @@ class Reader: def read(self) -> tuple[list[Glyph], list[GlyphSet], list[Sentence]]: glyphs = self.__read_image() names = self.__read_names() + sets = self.__read_sets() for glyph, name in zip(glyphs, names, strict=False): glyph.name = name + if self.add_all: + sets.insert(0, GlyphSet(index=0, length=len(glyphs), name="ALL")) + if self.add_empty and "EMPTY" not in names: if len(glyphs) >= MAX_GLYPHS: self.log.error( @@ -51,11 +55,8 @@ class Reader: sys.exit(1) glyphs.insert(0, Glyph(data=[0] * 4, name="EMPTY")) names.insert(0, "EMPTY") - - sets = self.__read_sets() - - if self.add_all: - sets.insert(0, GlyphSet(index=0, length=len(glyphs), name="ALL")) + for glyphset in sets: + glyphset.index += 1 sentences = self.__read_sentences(names)