diff --git a/pitfall/fontkit/layout-engine.rkt b/pitfall/fontkit/layout-engine.rkt index 1c5c36f2..853359fd 100644 --- a/pitfall/fontkit/layout-engine.rkt +++ b/pitfall/fontkit/layout-engine.rkt @@ -54,7 +54,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/layout/LayoutEngine.js ;; Substitute and position the glyphs (set! glyphs (send this substitute glyphs features script language)) (report/file 'end-sub) - (error 'stop) + #;(error 'stop) (report/file 'ready-position) (define positions (send this position glyphs features script language)) (report/file 'fired-position) diff --git a/pitfall/fontkit/ot-processor.rkt b/pitfall/fontkit/ot-processor.rkt index 4b7846cf..c306a7c3 100644 --- a/pitfall/fontkit/ot-processor.rkt +++ b/pitfall/fontkit/ot-processor.rkt @@ -146,7 +146,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/opentype/OTProcessor.js (define pos (· this glyphIterator index)) (define glyph (send (· this glyphIterator) increment sequenceIndex)) (define idx 0) - (report*/file (list-ref sequence idx) glyph (and glyph (· glyph id))) + (report*/file (and (pair? sequence) (list-ref sequence idx)) glyph (and glyph (· glyph id))) (while (and (< idx (length sequence)) glyph (fn (list-ref sequence idx) (· glyph id))) (report* 'in-match-loop idx (· glyph id)) @@ -164,6 +164,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/opentype/OTProcessor.js (send this match sequenceIndex sequence (λ (component glyph) (= component glyph)) empty)) (define/public (coverageSequenceMatches sequenceIndex sequence) + (report 'in-coverageSequenceMatches) (send this match sequenceIndex sequence (λ (coverage glyph) (>= (send this coverageIndex coverage glyph) 0)))) (define/public (getClassID glyph classDef) @@ -235,9 +236,9 @@ https://github.com/mbutterick/fontkit/blob/master/src/opentype/OTProcessor.js [(3) (report 'case-3) (and - (send this coverageSequenceMatches (- (· table backtrackGlyphCount)) (· table backtrackCoverage)) - (send this coverageSequenceMatches 0 (· table inputCoverage)) - (send this coverageSequenceMatches (· table inputGlyphCount) (· table lookaheadCoverage)) + (report (send this coverageSequenceMatches (- (· table backtrackGlyphCount)) (· table backtrackCoverage)) 'a) + (report (send this coverageSequenceMatches 0 (· table inputCoverage)) 'b) + (report (send this coverageSequenceMatches (· table inputGlyphCount) (· table lookaheadCoverage)) 'c) (send this applyLookupList (· table lookupRecords)))] [else #f])) diff --git a/pitfall/pitfall/test/test16rkt.pdf b/pitfall/pitfall/test/test16rkt.pdf index e69de29b..4ff081a5 100644 Binary files a/pitfall/pitfall/test/test16rkt.pdf and b/pitfall/pitfall/test/test16rkt.pdf differ