Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/pixie/fontformats/opentype.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2087,6 +2087,7 @@ proc parsePairPos(buf: string, offset: int): PairPos =
proc parseLookup(
buf: string, offset: int, pairPosTables: var seq[PairPos]
): Lookup =
## Reads pair positioning directly or through an extension lookup.
var i = offset

buf.eofCheck(i + 6)
Expand All @@ -2106,10 +2107,26 @@ proc parseLookup(
result.markFilteringSet = buf.readUint16(i).swap()

for subTableOffset in result.subTableOffsets:
if result.lookupType == 2:
let pairPos = parsePairPos(buf, offset + subTableOffset.int)
if pairPos.glyphPairAdjustments.len > 0 or
pairPos.classPairAdjustments.len > 0:
var subTablePosition = offset + subTableOffset.int
case result.lookupType:
of 2:
discard
of 9:
buf.eofCheck(subTablePosition + 8)
if buf.readUint16(subTablePosition).swap() != 1:
failUnsupported("positioning extension format")
if buf.readUint16(subTablePosition + 2).swap() != 2:
continue
let extensionOffset = buf.readUint32(subTablePosition + 4).swap()
if extensionOffset < 8 or
extensionOffset.uint64 > (buf.len - subTablePosition).uint64:
failUnsupported("positioning extension offset")
subTablePosition += extensionOffset.int
else:
continue
let pairPos = parsePairPos(buf, subTablePosition)
if pairPos.glyphPairAdjustments.len > 0 or
pairPos.classPairAdjustments.len > 0:
pairPosTables.add(pairPos)

proc parseLookupList(buf: string, offset: int): LookupList =
Expand Down
83 changes: 83 additions & 0 deletions tests/test_kerning.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import
std/unicode,
flatty/binny, pixie, pixie/fontformats/opentype

proc words(values: openArray[int]): string =
## Encodes big-endian words for small OpenType test tables.
for value in values:
result.add(char((value shr 8) and 255))
result.add(char(value and 255))

proc writeOffset(data: var string, position, value: int) =
## Writes a big-endian 32-bit table offset.
for i in 0 ..< 4:
data[position + i] = char((value shr ((3 - i) * 8)) and 255)

proc positioning(pair: string, extensionOffset = 0): string =
## Wraps a pair table in a direct or extended GPOS lookup.
let lookupType =
if extensionOffset == 0:
2
else:
9
result = words([1, 0, 0, 0, 10, 1, 4, lookupType, 0, 1, 8])
if extensionOffset > 0:
result.add(words([1, 2, 0, 0]))
result.writeOffset(26, extensionOffset)
result.setLen(22 + extensionOffset)
result.add(pair)

proc fontWithPositioning(positioning: string): OpenType =
## Substitutes a synthetic positioning table into an existing valid font.
var data = readFile("tests/fonts/IBMPlexSans-Regular_2.ttf")
let count = data.readUint16(4).swap().int
for i in 0 ..< count:
let record = 12 + i * 16
if data[record ..< record + 4] == "GPOS":
data.writeOffset(record + 8, data.len)
data.writeOffset(record + 12, positioning.len)
data.add(positioning)
return parseOpenType(data)
doAssert false, "The test font must contain a GPOS table"

proc expectMalformed(positioning: string) =
## Requires malformed extension data to raise the public Pixie error.
var failed = false
try:
discard fontWithPositioning(positioning)
except PixieError:
failed = true
doAssert failed

block:
let
original = parseOpenType(readFile("tests/fonts/IBMPlexSans-Regular_2.ttf"))
left = original.cmap.runeToGlyphId[Rune('A')].int
right = original.cmap.runeToGlyphId[Rune('V')].int
pairs = [
words([1, 12, 4, 0, 1, 18, 1, 1, left, 1, right, -49]),
words([
2, 24, 4, 0, 30, 38, 2, 2, 0, 0, 0, -49,
1, 1, left, 1, left, 1, 1, 1, right, 1, 1
])
]
echo "Testing direct and extended glyph and class kerning"
for pair in pairs:
for extensionOffset in [0, 8, 70_000]:
let font = fontWithPositioning(positioning(pair, extensionOffset))
doAssert font.getKerningAdjustment(Rune('A'), Rune('V')) == -49
doAssert font.getKerningAdjustment(Rune('A'), Rune('A')) == 0
doAssert font.getKerningAdjustment(Rune('V'), Rune('A')) == 0

echo "Testing malformed positioning extensions"
var invalid = positioning(pairs[0], 8)
invalid[23] = char(2)
expectMalformed(invalid)
invalid = positioning(pairs[0], 8)
invalid.writeOffset(26, 0)
expectMalformed(invalid)
invalid.writeOffset(26, int(uint32.high))
expectMalformed(invalid)
invalid = positioning(pairs[0], 8)
invalid.setLen(29)
expectMalformed(invalid)
1 change: 1 addition & 0 deletions tests/tests.nim
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import
test_images_draw,
test_images_tiled,
test_jpeg,
test_kerning,
test_paints,
test_paths,
test_paths_overwrite,
Expand Down
Loading