MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feedback

Browse source
This commit is contained in:
Ryan Oldenburg 2021-05-05 15:44:59 -05:00
parent a8aef40637
commit a5f6fa4022
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pixie/fontformats/opentype.nim
View file

@ -662,7 +662,7 @@ proc parseGlyfTable(buf: string, offset: int, loca: LocaTable): GlyfTable =
for glyphId in 0 ..< loca.offsets.len: for glyphId in 0 ..< loca.offsets.len:
result.offsets[glyphId] = offset.uint32 + loca.offsets[glyphId] result.offsets[glyphId] = offset.uint32 + loca.offsets[glyphId]
proc parseKernTable(buf: string, offset: int, cmap: CmapTable): KernTable = proc parseKernTable(buf: string, offset: int): KernTable =
var i = offset var i = offset
buf.eofCheck(i + 2) buf.eofCheck(i + 2)
@ -710,9 +710,7 @@ proc parseKernTable(buf: string, offset: int, cmap: CmapTable): KernTable =
for table in result.subTables: for table in result.subTables:
if (table.coverage and 1) != 0: # Horizontal data if (table.coverage and 1) != 0: # Horizontal data
for pair in table.kernPairs: for pair in table.kernPairs:
if pair.value != 0 and if pair.value != 0:
pair.left in cmap.glyphIdToRune and
pair.right in cmap.glyphIdToRune:
let key = (pair.left, pair.right) let key = (pair.left, pair.right)
var value = pair.value.float32 var value = pair.value.float32
if key in result.kerningPairs: if key in result.kerningPairs:
@ -1000,7 +998,7 @@ proc parsePairPos(buf: string, offset: int): PairPos =
i += 2 i += 2
case result.posFormat: case result.posFormat:
of 1: of 1: # Glyph ID pairs
buf.eofCheck(i + 8) buf.eofCheck(i + 8)
result.coverageOffset = buf.readUint16(i + 0).swap() result.coverageOffset = buf.readUint16(i + 0).swap()
@ -1052,7 +1050,7 @@ proc parsePairPos(buf: string, offset: int): PairPos =
inc ci inc ci
else: else:
discard discard
of 2: of 2: # Class pairs
buf.eofCheck(i + 14) buf.eofCheck(i + 14)
result.coverageOffset = buf.readUint16(i + 0).swap() result.coverageOffset = buf.readUint16(i + 0).swap()
@ -1563,8 +1561,7 @@ proc parseOpenType*(buf: string): OpenType =
parseGlyfTable(buf, result.tableRecords["glyf"].offset.int, result.loca) parseGlyfTable(buf, result.tableRecords["glyf"].offset.int, result.loca)
if "kern" in result.tableRecords: if "kern" in result.tableRecords:
result.kern = result.kern = parseKernTable(buf, result.tableRecords["kern"].offset.int)
parseKernTable(buf, result.tableRecords["kern"].offset.int, result.cmap)
if "GPOS" in result.tableRecords: if "GPOS" in result.tableRecords:
result.gpos = parseGposTable(buf, result.tableRecords["GPOS"].offset.int) result.gpos = parseGposTable(buf, result.tableRecords["GPOS"].offset.int)