ref: 720585ccc54165aa6d41a0fe85374223ac3a9e37
parent: 207f8c591b3e831f4a35185b99482cfb34fccf4b
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Wed Jun 19 21:41:38 EDT 2024
handle offsets; clean up a bit; add more types
--- a/fmt.sh
+++ b/fmt.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-raco fmt --width 100 --indent 2 -i *.rkt
+raco fmt --width 102 --indent 2 -i *.rkt
--- a/otf.rkt
+++ b/otf.rkt
@@ -19,8 +19,8 @@
(make-contract #:name 'tag/c #:first-order (λ (x) (and (string? x) (= 4 (string-length x))))))
(define/contract (indent lst)
- (-> (listof string?) (listof string?))
- (map (λ (str) (string-append "\t" str)) lst))
+ (-> (listof any/c) (listof string?))
+ (map (λ (str) (string-append "\t" str)) (flatten lst)))
(define/contract (c-typedef? s)
(-> string? boolean?)
@@ -51,24 +51,6 @@
(-> type? positive?)
(/ (type-bits t) 8))
-(define (field-unused? f)
- (assoc 'unused (field-attrs f)))
-
-(define (field-count f)
- (assoc 'count (field-attrs f)))
-
-(define (field-test f)
- (filter (λ (t) (eq? (car t) 'test)) (field-attrs f)))
-
-(define (field-verb f)
- (assoc 'verb (field-attrs f)))
-
-(define (field-cond f)
- (assoc 'cond (field-attrs f)))
-
-(define (field-ptr f)
- (assoc 'ptr (field-attrs f)))
-
(define (block stmt lst)
(if (= (length lst) 1) (list* stmt lst) (list (string-append stmt "{") lst "}")))@@ -75,49 +57,10 @@
(define (wrap-cond-c cond lst)
(match cond
[#f lst]
- [(list 'cond op ref n ...)
+ [(list op ref n ...)
(block (~a "if(" (string-join (map (λ (n) (~a "v->" ref " " op " " n)) n) " || ") ")")- (indent (flatten lst)))]))
+ (indent lst))]))
-(define (field-print-c f)
- (define t (field-type f))
- (define count (field-count f))
- (define end (and count (if (cmplx? t) (~a "v->" (cadr count)) (cadr count))))
- (define basic-array (and (type? t) end))
- (define fixed-array (and basic-array (number? end)))
- (define array-index (if (field-count f) "[i]" ""))
- (define verb (if (type? t) (if (field-verb f) (cadr (field-verb f)) (type-verb t)) ""))
- (define print-index
- (if basic-array
- (~a "Bprint(f, \"%*s%s[%d]: "
- verb
- "\\n\", indent, \"\", \""
- (field-name f)
- "\", i, v->"
- (field-name f)
- array-index
- ");")
- (~a "Bprint(f, \"%*s%s[%d]:\\n\", indent, \"\", \"" (field-name f) "\", i);")))
- (define array-loop
- (if count
- (λ (lst)
- (block (~a "for(int i = 0; i < " (if fixed-array "" "v->") (cadr count) "; i++)")
- (indent (list* print-index (if basic-array empty lst)))))
- identity))
- (define lst
- (list
- (if (type? t)
- (~a "Bprint(f, \"%*s%s: "
- verb
- "\\n\", indent, \"\", \""
- (field-name f)
- "\", v->"
- (field-name f)
- array-index
- ");")
- (~a "print_" (cmplx-name t) "(f, indent+indentΔ, &v->" (field-name f) array-index ");"))))
- (if (field-unused? f) empty (wrap-cond-c (field-cond f) (array-loop lst))))
-
(define (invert-c op)
(match op
['== '!=]
@@ -132,14 +75,14 @@
[(define/generic super-c-type c-type)
(define (gen-h f)
(define cnt (field-count f))
- (define fixed-array (and cnt (number? (cadr cnt))))
+ (define fixed-array (number? cnt))
+ (define is-ptr (and (cmplx? (field-type f)) (field-offset f)))
(list (~a (if (field-unused? f) "// " "")
(super-c-type (field-type f))
" "
- (if (and cnt (not fixed-array)) "*" "")
+ (if (or is-ptr (and cnt (not fixed-array))) "*" "")
(field-name f)
- (if fixed-array (~a "[" (cadr cnt) "]") "")
- ";")))
+ (if fixed-array (~a "[" cnt "];") ";"))))
(define (gen-c f b index)
(define (size t)
(if (type? t) (type-size t) 0))
@@ -150,6 +93,7 @@
(define (format-number x)
(if (<= x 32768) (~r x) (~r x #:base 16 #:sign '("0x" "" "-0x"))))(define (parse-if-error read)
+ (define is-ptr (and (cmplx? (field-type f)) (field-offset f)))
(match (field-count f)
[#f
(if (or declared (not (field-unused? f)))
@@ -159,20 +103,23 @@
" = "
((type-parse (field-type f)) b index)
";")
- (list (if declared (~a (name (field-type f)) " " ref ";") empty)
- (~a "if(read_" (name (field-type f)) "(ctx, &" ref ") < 0){")))- (if index empty (~a "if(skip_bytes(ctx, " (size (field-type f)) ") < 0){")))]+ (list
+ (if declared
+ (~a (name (field-type f)) " " ref ";")
+ (if is-ptr (~a ref " = calloc(1, sizeof(*" ref "));") empty))
+ (~a "if(read_" (name (field-type f)) "(ctx, " (if is-ptr "" "&") ref ") < 0){")))+ (if index empty (~a "if(ctxreadn(ctx, " (size (field-type f)) ") == nil){")))][count
#:when (type? (field-type f))
(if (field-unused? f)
empty
- (list
- (~a "for(int i = 0; i < " (if (number? (cadr count)) "" "v->") (cadr count) "; i++)")
- (~a "\t"
- ref
- "[i] = "
- ((type-parse (field-type f)) b index (~a "i*" (size (field-type f))))
- ";")))]
+ (list (if (number? count) empty (~a ref " = malloc(" count "*sizeof(*" ref "));"))+ (~a "for(int i = 0; i < " count "; i++)")
+ (~a "\t"
+ ref
+ "[i] = "
+ ((type-parse (field-type f)) b index (~a "i*" (size (field-type f))))
+ ";")))]
[count
(~a "if(ctxarray(ctx, &"
ref
@@ -180,8 +127,8 @@
(super-c-type (field-type f))
", sizeof("(super-c-type (field-type f))
- "), v->"
- (cadr count)
+ "), "
+ count
") < 0){")]))(define (test-cond ts)
(map (λ (t)
@@ -190,25 +137,120 @@
(string-join (map (λ (v) (~a ref " " (invert-c op) " " (format-number v))) a)
" && ")]))
ts))
- (list*
- (parse-if-error #t)
- (if index
- empty
- (list (~a "\twerrstr(\"%s: %r\", \"" (field-name f) "\");") (~a "\tgoto err;") (~a "}")))
- (match (test-cond (field-test f))
- [(list) empty]
- [(list a ...)
- (list (~a "if(" (string-join a " || ") "){")- (~a "\twerrstr(\"%s: invalid value: %d (0x%ux)\", \""
- (field-name f)
- "\", "
- ref
- ", "
- ref
- ");")
- (~a "\tgoto err;")
- (~a "}"))])))])
+ (define (at lst)
+ (define at (field-offset f))
+ (if (not at)
+ lst
+ (list (~a "if(v->" at " != 0){")+ (~a "\tif(ctxpushrange(ctx, v->" at ", -1) < 0)")
+ (~a "\t\tgoto err;")
+ (indent lst)
+ (~a "\tif(ctxpoprange(ctx) < 0)")
+ (~a "\t\tgoto err;")
+ (~a "}"))))
+ (at (list* (parse-if-error #t)
+ (if index
+ empty
+ (list (~a "\twerrstr(\"%s: %r\", \"" (field-name f) "\");")
+ (~a "\tgoto err;")
+ (~a "}")))
+ (match (test-cond (field-test f))
+ [(list) empty]
+ [(list a ...)
+ (list (~a "if(" (string-join a " || ") "){")+ (~a "\twerrstr(\"%s: invalid value: %d (0x%ux)\", \""
+ (field-name f)
+ "\", "
+ ref
+ ", "
+ ref
+ ");")
+ (~a "\tgoto err;")
+ (~a "}"))]))))])
+(define/contract (field-attr f a)
+ (-> field? symbol? any)
+ (define v (assoc a (field-attrs f)))
+ (and v (cadr v)))
+
+(define (field-unused? f)
+ (field-attr f 'unused))
+
+(define (field-verb f)
+ (field-attr f 'verb))
+
+(define (field-offset f)
+ (field-attr f 'at))
+
+(define (field-cond f)
+ (define v (assoc 'cond (field-attrs f)))
+ (and v (rest v)))
+
+(define/contract (field-count f)
+ (-> field? (or/c false/c number? string?))
+ (define (fmt-expr e)
+ (cond
+ [(number? e) e]
+ [(list? e)
+ (match e
+ [(list op x y) (~a (fmt-expr x) op (fmt-expr y))])]
+ [(symbol? e) (~a "v->" e)]))
+ (define e (field-attr f 'count))
+ (and e (fmt-expr e)))
+
+(define (field-test f)
+ (filter (λ (t) (eq? (car t) 'test)) (field-attrs f)))
+
+(define (field-print-c f)
+ (define t (field-type f))
+ (define cnt (field-count f))
+ (define basic-array (and cnt (type? t)))
+ (define fixed-array (and basic-array (number? cnt)))
+ (define array-index (if cnt "[i]" ""))
+ (define verb (if (type? t) (or (field-verb f) (type-verb t)) ""))
+ (define print-index
+ (if basic-array
+ (~a "Bprint(f, \"%*s%s[%d]: "
+ verb
+ "\\n\", indent, \"\", \""
+ (field-name f)
+ "\", i, v->"
+ (field-name f)
+ array-index
+ ");")
+ (~a "Bprint(f, \"%*s%s[%d]:\\n\", indent, \"\", \"" (field-name f) "\", i);")))
+ (define array-loop
+ (if cnt
+ (λ (lst)
+ (block (~a "for(int i = 0; i < " cnt "; i++)")
+ (indent (list* print-index (if basic-array empty lst)))))
+ identity))
+ (define is-ptr (and (cmplx? t) (field-offset f) (not cnt)))
+ (define lst
+ (flatten
+ (list
+ (if (type? t)
+ (~a "Bprint(f, \"%*s%s: "
+ verb
+ "\\n\", indent, \"\", \""
+ (field-name f)
+ "\", v->"
+ (field-name f)
+ array-index
+ ");")
+ (list (if cnt empty (~a "Bprint(f, \"%*s%s:\\n\", indent, \"\", \"" (field-name f) "\");"))
+ (if is-ptr (~a "if(v->" (field-name f) " != nil)") empty)
+ (~a (if is-ptr "\t" "")
+ "print_"
+ (cmplx-name t)
+ "(f, indent+indentΔ, "
+ (if is-ptr "" "&")
+ "v->"
+ (field-name f)
+ array-index
+ ");"))))))
+ (if (field-unused? f) empty (wrap-cond-c (field-cond f) (array-loop lst))))
+
(define (filter-extra extra key)
(flatten (filter-map (λ (e) (and (eq? (car e) key) (cdr e))) extra)))
@@ -221,7 +263,7 @@
(flatten (append (list (~a "typedef struct " (cmplx-name c) " " (cmplx-name c) ";")
(~a "")
(~a "struct " (cmplx-name c) " {"))- (indent (flatten (map super-gen-h (cmplx-fields c))))
+ (indent (map super-gen-h (cmplx-fields c)))
(indent (filter-extra (cmplx-extra c) 'field))
(list (~a "};")
(~a "")
@@ -229,7 +271,7 @@
(define (gen-c c b index)
(define (no-vla? f)
(define cnt (field-count f))
- (or (not cnt) (number? (cadr cnt))))
+ (or (not cnt) (number? cnt)))
; group fields to minimize number of reads
; complex types are always alone
; simple types can be combined unless versioned
@@ -253,9 +295,7 @@
[#f (type-size (field-type f))]
[count
#:when (type? (field-type f))
- ((if (number? (cadr count))
- (λ (sz) (* (cadr count) sz))
- (λ (sz) (~a "v->" (cadr count) "*" sz)))
+ ((if (number? count) (λ (sz) (* count sz)) (λ (sz) (~a count "*" sz)))
(type-size (field-type f)))]))
(define (add x y)
(match (list x y)
@@ -269,6 +309,7 @@
empty))
(p g 0))
(define (gen-group-c fields)
+ (define unused (andmap field-unused? fields))
(wrap-cond-c (field-cond (car fields))
(if (cmplx? (field-type (car fields)))
(map (λ (f) (super-gen-c f #f #f)) fields)
@@ -275,6 +316,7 @@
(let* ([sum (foldr (λ (f accu) (add (field-size f) accu)) 0 fields)]
[lst (flatten (list* (~a "if((b = ctxreadn(ctx, " sum ")) == nil)")
(~a "\tgoto err;")
+ (if unused "USED(b);" empty)
(parse-group fields)))])
lst))))
(flatten
@@ -283,7 +325,7 @@
(~a "read_" (cmplx-name c) "(Ctx *ctx, " (cmplx-name c) " *v)")
(~a "{")(~a "\tu8int *b;"))
- (indent (flatten (map gen-group-c (group-fields (cmplx-fields c)))))
+ (indent (map gen-group-c (group-fields (cmplx-fields c))))
(indent (filter-extra (cmplx-extra c) 'read))
(list (~a "\treturn 0;")
(~a "err:")
@@ -294,7 +336,7 @@
(~a "void")
(~a "print_" (cmplx-name c) "(Biobuf *f, int indent, " (cmplx-name c) " *v)")
(~a "{")- (indent (flatten (map field-print-c (cmplx-fields c))))
+ (indent (map field-print-c (cmplx-fields c)))
(indent (filter-extra (cmplx-extra c) 'print))
(~a "}")))))
(define (c-type c)
@@ -381,11 +423,14 @@
(define-syntax (mkattr stx)
(syntax-parse stx
- [(_ offType:id ({~literal ptr} type:id name:id))- (begin
- (when (not (type-offset? (syntax->datum #`offType)))
- (raise-syntax-error #f "can't be used as an offset" stx #'offType))
- #''(ptr type name))]
+ [(_ _ ({~literal at} ref:id))+ (let ([rf (assoc (syntax->datum #`ref) fields)])
+ (begin
+ (when (not rf)
+ (raise-syntax-error #f "no such field" stx #'ref))
+ (when (not (type-offset? (cadr rf)))
+ (raise-syntax-error #f (~a (cadr rf) " can't be used as an offset") stx #'ref))
+ #''(at ref)))]
[(_ _ (n:number)) #''(count n)]
[(_ type {~literal hex})(begin
@@ -417,6 +462,7 @@
stx
#'n))]
[else (raise-syntax-error #f "no such field" stx #'n)]))]
+ [(_ _ ({~literal count} e:expr)) #''(count e)] ; FIXME - check fields and ops/numbers [(_ _ {~literal unused}) #''(unused #t)]))(define-syntax (mkfield stx)
@@ -439,11 +485,6 @@
(set! fields '())
#'(list (mkfield [~@ . x]) ...))]))
-(mkcmplx EncodingRecord
- (mkfields {uint16 platformID (<= 4)}- {uint16 encodingID}- {Offset32 subtableOffset (ptr SubTableCmap subtable)}))-
(mkcmplx SubHeader
(mkfields {uint16 firstCode} {uint16 entryCode} {int16 idDelta} {uint16 idRangeOffset}))@@ -453,27 +494,24 @@
(mkcmplx SubtableCmap0 (mkfields {uint16 length} {uint16 language} {uint8 glyphIdArray [256]})); FIXME
-#;(mkcmplx SubtableCmap2
- (mkfields {uint16 length}- {uint16 language}- {uint16 subHeaderKeys [256]}- {SubHeader subHeaders (count ?)}- {uint16 glyphIdArray (count ?)}))+(mkcmplx SubtableCmap2 (mkfields {uint16 length} {uint16 language} {uint16 subHeaderKeys [256]}))+#| {SubHeader subHeaders (count ?)}+ {uint16 glyphIdArray (count ?)}))|#; FIXME
-#;(mkcmplx SubtableCmap4
- (mkfields {uint16 length}- {uint16 language}- {uint16 segCountX2}- {uint16 searchRange}- {uint16 entrySelector}- {uint16 rangeShift}- {uint16 endCode (count (/ segCountX2 2))}- {uint16 reservedPad unused}- {uint16 startCode (count (/ segCountX2 2))}- {int16 idDelta (count (/ segCountX2 2))}- {int16 idRangeOffset (count (/ segCountX2 2))}- {uint16 glyphIdArray (count ?)}))+(mkcmplx SubtableCmap4
+ (mkfields {uint16 length}+ {uint16 language}+ {uint16 segCountX2}+ {uint16 searchRange}+ {uint16 entrySelector}+ {uint16 rangeShift}+ {uint16 endCode (count (/ segCountX2 2))}+ {uint16 reservedPad unused}+ {uint16 startCode (count (/ segCountX2 2))}+ {int16 idDelta (count (/ segCountX2 2))}+ {int16 idRangeOffset (count (/ segCountX2 2))}+ #;{uint16 glyphIdArray (count ?)}))(mkcmplx SubtableCmap6
(mkfields {uint16 length}@@ -485,19 +523,18 @@
(mkcmplx SubtableCmap8
(mkfields {uint16 length} {uint16 language}- ; FIXME this crosses an uncomfortable threshold - allocate dynamically
{uint8 is32 [8192]} {uint32 numGroups} {MapGroup groups (count numGroups)})); FIXME
-#;(mkcmplx SubtableCmap10
- (mkfields {uint16 reserved}- {uint32 length}- {uint32 language}- {uint32 startCharCode}- {uint32 numChars}- {uint16 glyphIdArray (count ?)}))+(mkcmplx SubtableCmap10
+ (mkfields {uint16 reserved}+ {uint32 length}+ {uint32 language}+ {uint32 startCharCode}+ {uint32 numChars}+ #;{uint16 glyphIdArray (count ?)}))(mkcmplx SubtableCmap12or13
(mkfields {uint16 reserved}@@ -518,7 +555,11 @@
(mkfields {uint32 numUVSMappings} {UVSMapping uvsMappings (count numUVSMappings)}))(mkcmplx VariationSelector
- (mkfields {uint24 varSelector} {Offset32 defaultUVSOffset} {Offset32 nonDefaultUVSOffset}))+ (mkfields {uint24 varSelector}+ {Offset32 defaultUVSOffset}+ {Offset32 nonDefaultUVSOffset}+ {DefaultUVS defaultUVS (at defaultUVSOffset)}+ {NonDefaultUVS nonDefaultUVS (at nonDefaultUVSOffset)}))(mkcmplx SubtableCmap14
(mkfields {uint32 length}@@ -526,17 +567,23 @@
{VariationSelector varSelector (count numVarSelectorRecords)}))(mkcmplx SubtableCmap
- (mkfields {uint16 format (== 0 #|2 4|# 6 8 #|10|# 12 13 14)}+ (mkfields {uint16 format (== 0 2 4 6 8 10 12 13 14)}; FIXME these fields should be put into a union automatically
{SubtableCmap0 sub0 (== format 0)}- ;{SubtableCmap2 sub2 (== format 2)}- ;{SubtableCmap4 sub4 (== format 4)}+ {SubtableCmap2 sub2 (== format 2)}+ {SubtableCmap4 sub4 (== format 4)} {SubtableCmap6 sub6 (== format 6)} {SubtableCmap8 sub8 (== format 8)}- ;{SubtableCmap10 sub10 (== format 10)}+ {SubtableCmap10 sub10 (== format 10)} {SubtableCmap12or13 sub12or13 (== format 12 13)} {SubtableCmap14 sub14 (== format 14)}))+(mkcmplx EncodingRecord
+ (mkfields {uint16 platformID (<= 4)}+ {uint16 encodingID}+ {Offset32 subtableOffset}+ {SubtableCmap subtable (at subtableOffset)}))+
(mkcmplx TableCmap
(mkfields {uint16 version unused (== 0)} {uint16 numTables}@@ -653,6 +700,42 @@
{int8 minAfterBL} {int8 pad [2] unused}))+(mkcmplx IndexSubtable1
+ (mkfields {Offset32 sbitOffsets} #;(count (+ (- lastGlyphIndex firstGlyphIndex) 2))))+
+(mkcmplx IndexSubtable2 (mkfields {uint32 imageSize} {BigGlyphMetrics bigMetrics}))+
+; FIXME
+(mkcmplx IndexSubtable3
+ (mkfields {Offset16 sbitOffsets} #;(count (+ (- lastGlyphIndex firstGlyphIndex) 2))))+
+(mkcmplx GlyphIdOffsetPair (mkfields {uint16 glyphID} {Offset16 sbitOffset}))+
+(mkcmplx IndexSubtable4
+ (mkfields {uint32 numGlyphs} {GlyphIdOffsetPair glyphArray (count (+ numGlyphs 1))}))+
+(mkcmplx IndexSubtable5
+ (mkfields {uint32 imageSize}+ {BigGlyphMetrics bigMetrics}+ {uint32 numGlyphs}+ {uint16 glyphIdArray (count numGlyphs)}))+
+(mkcmplx IndexSubtable
+ (mkfields {uint16 indexFormat (>= 1) (<= 5)}+ {uint16 imageFormat}+ {Offset32 imageDataOffset}+ {IndexSubtable1 sub1 (== indexFormat 1)}+ {IndexSubtable2 sub2 (== indexFormat 2)}+ {IndexSubtable3 sub3 (== indexFormat 3)}+ {IndexSubtable4 sub4 (== indexFormat 4)}+ {IndexSubtable5 sub5 (== indexFormat 5)}))+
+(mkcmplx IndexSubtableRecord
+ (mkfields {uint16 firstGlyphIndex}+ {uint16 lastGlyphIndex}+ {Offset32 indexSubtableOffset}+ {IndexSubtable indexSubtable (at indexSubtableOffset)}))+
(mkcmplx BitmapSize
(mkfields {Offset32 indexSubtableListOffset} {uint32 indexSubtableListSize}@@ -665,8 +748,16 @@
{uint8 ppemX} {uint8 ppemY} {uint8 bitDepth}- {int8 flags}))+ {int8 flags}+ {IndexSubtableRecord+ indexSubtableList
+ (count numberOfIndexSubtables)
+ (at indexSubtableListOffset)}))
+(mkcmplx TableEBDT
+ (mkfields {uint16 majorVersion (== 2)} {uint16 minorVersion (== 0) unused})+ #:tag "EBDT")
+
(mkcmplx TableEBLC
(mkfields {uint16 majorVersion (== 2) unused} {uint16 minorVersion (== 0) unused}@@ -723,6 +814,46 @@
{Offset32 itemVarStoreOffset (>= minorVersion 3)})#:tag "GDEF")
+(mkcmplx LangSys
+ (mkfields {Offset16 lookupOrderOffset unused}+ {uint16 requiredFeatureIndex}+ {uint16 featureIndexCount}+ {uint16 featureIndices (count featureIndexCount)}))+
+(mkcmplx LangSysRecord
+ (mkfields {Tag langSysTag} {Offset16 langSysOffset} {LangSys langSys (at langSysOffset)}))+
+(mkcmplx Script
+ (mkfields {Offset16 defaultLangSysOffset}+ {uint16 langSysCount}+ {LangSysRecord langSysRecords (count langSysCount)}+ {LangSys defaultLangSys (at defaultLangSysOffset)}))+
+(mkcmplx ScriptRecord
+ (mkfields {Tag scriptTag} {Offset16 scriptOffset} {Script script (at scriptOffset)}))+
+(mkcmplx ScriptList (mkfields {uint16 scriptCount} {ScriptRecord scriptRecords (count scriptCount)}))+
+(mkcmplx Feature
+ (mkfields {Offset16 featureParamsOffset}+ {uint16 lookupIndexCount}+ {uint16 lookupListIndices (count lookupIndexCount)}))+
+(mkcmplx FeatureRecord
+ (mkfields {Tag featureTag} {Offset16 featureOffset} {Feature feature (at featureOffset)}))+
+(mkcmplx FeatureList
+ (mkfields {uint16 featureCount} {FeatureRecord featureRecords (count featureCount)}))+
+(mkcmplx Lookup
+ (mkfields {uint16 lookupType}+ {uint16 lookupFlag}+ {uint16 subTableCount}+ {Offset16 subtableOffsets (count subTableCount)}+ {uint16 markFilteringSet}))+
+(mkcmplx LookupList (mkfields {uint16 lookupCount} {Offset16 lookupOffsets (count lookupCount)}))+
(mkcmplx TableGPOS
(mkfields {uint16 majorVersion (== 1) unused} {uint16 minorVersion (<= 1)}@@ -729,7 +860,10 @@
{Offset16 scriptListOffset} {Offset16 featureListOffset} {Offset16 lookupListOffset}- {Offset32 featureVariationsOffset (== minorVersion 1)})+ {Offset32 featureVariationsOffset (== minorVersion 1)}+ {ScriptList scriptList (at scriptListOffset)}+ {FeatureList featureList (at featureListOffset)}+ {LookupList lookupList (at lookupListOffset)})#:tag "GPOS")
(mkcmplx TableGSUB
@@ -738,17 +872,11 @@
{Offset16 scriptListOffset} {Offset16 featureListOffset} {Offset16 lookupListOffset}- {Offset32 featureVariationsOffset (== minorVersion 1)})+ {Offset32 featureVariationsOffset (== minorVersion 1)}+ {ScriptList scriptList (at scriptListOffset)}+ {FeatureList featureList (at featureListOffset)})#:tag "GSUB")
-(mkcmplx TableMATH
- (mkfields {uint16 majorVersion (== 1) unused}- {uint16 minorVersion (== 0) unused}- {Offset16 mathConstantsOffset}- {Offset16 mathGlyphInfoOffset}- {Offset16 mathVariantsOffset})- #:tag "MATH")
-
(mkcmplx MathValueRecord (mkfields {FWORD value} {Offset16 deviceOffset}))(mkcmplx MathConstants
@@ -809,12 +937,6 @@
{MathValueRecord radicalKernAfterDegree} {int16 radicalDegreeBottomRaisePercent}))-(mkcmplx MathGlyphInfo
- (mkfields {Offset16 mathItalicsCorrectionInfoOffset}- {Offset16 mathTopAccentAttachmentOffset}- {Offset16 extendedShapeCoverageOffset}- {Offset16 mathKernInfoOffset}))-
(mkcmplx MathItalicsCorrectionInfo
(mkfields {Offset16 italicsCorrectionCoverageOffset} {uint16 italicsCorrectionCount}@@ -841,6 +963,16 @@
{MathValueRecord correctionHeight (count heightCount)} {MathValueRecord kernValues (count heightCount)}))+(mkcmplx Coverage1 (mkfields {uint16 glyphCount} {uint16 glyphArray (count glyphCount)}))+
+(mkcmplx RangeRecord (mkfields {uint16 startGlyphID} {uint16 endGlyphID} {uint16 startCoverageIndex}))+
+(mkcmplx Coverage2 (mkfields {uint16 rangeCount} {RangeRecord rangeRecords (count rangeCount)}))+
+(mkcmplx
+ Coverage
+ (mkfields {uint16 format (== 1 2)} {Coverage1 cov1 (== format 1)} {Coverage2 cov2 (== format 2)}))+
(mkcmplx MathVariants
(mkfields {UFWORD minConnectorOverlap} {Offset16 vertGlyphCoverageOffset}@@ -848,15 +980,22 @@
{uint16 vertGlyphCount} {uint16 horizGlyphCount} {Offset16 vertGlyphConstructionOffsets (count vertGlyphCount)}- {Offset16 horizGlyphConstructionOffsets (count horizGlyphCount)}))+ {Offset16 horizGlyphConstructionOffsets (count horizGlyphCount)}+ {Coverage vertGlyphCoverage (at vertGlyphCoverageOffset)}+ {Coverage horizGlyphCoverage (at horizGlyphCoverageOffset)}))+(mkcmplx MathGlyphInfo
+ (mkfields
+ {Offset16 mathItalicsCorrectionInfoOffset}+ {Offset16 mathTopAccentAttachmentOffset}+ {Offset16 extendedShapeCoverageOffset} ; FIXME WHERE is this shit defined???+ {Offset16 mathKernInfoOffset}+ {MathItalicsCorrectionInfo mathItalicsCorrectionInfo (at mathItalicsCorrectionInfoOffset)}+ {MathTopAccentAttachment mathTopAccentAttachment (at mathTopAccentAttachmentOffset)}+ {MathKernInfo mathKernInfo (at mathKernInfoOffset)}))+
(mkcmplx MathGlyphVariantRecord (mkfields {uint16 variantGlyph} {UFWORD advanceMeasurement}))-(mkcmplx MathGlyphConstruction
- (mkfields {Offset16 glyphAssemblyOffset}- {uint16 variantCount}- {MathGlyphVariantRecord mathGlyphVariantRecords (count variantCount)}))-
(mkcmplx GlyphPart
(mkfields {uint16 glyphID} {UFWORD startConnectorLength}@@ -869,6 +1008,23 @@
{uint16 partCount} {GlyphPart partRecords (count partCount)}))+(mkcmplx MathGlyphConstruction
+ (mkfields {Offset16 glyphAssemblyOffset}+ {uint16 variantCount}+ {MathGlyphVariantRecord mathGlyphVariantRecords (count variantCount)}+ {GlyphAssembly glyphAssembly (at glyphAssemblyOffset)}))+
+(mkcmplx TableMATH
+ (mkfields {uint16 majorVersion (== 1) unused}+ {uint16 minorVersion (== 0) unused}+ {Offset16 mathConstantsOffset}+ {Offset16 mathGlyphInfoOffset}+ {Offset16 mathVariantsOffset}+ {MathConstants mathConstants (at mathConstantsOffset)}+ {MathGlyphInfo mathGlyphInfo (at mathGlyphInfoOffset)}+ {MathVariants mathVariants (at mathVariantsOffset)})+ #:tag "MATH")
+
(mkcmplx TableOS∕2
(mkfields {uint16 version (<= 5)} {FWORD xAvgCharWidth}@@ -934,7 +1090,6 @@
(list (~a "\tcase " case-tag ":")
(~a "\t\tv->" (ptr c) " = calloc(1, sizeof(" (cmplx-name c) "));") (~a "\t\tif(read_" (cmplx-name c) "(ctx, v->" (ptr c) ") < 0){")- (~a "\t\t\twerrstr(\"%s: %r\", \"" tag "\");")
(~a "\t\t\tfree(v->" (ptr c) ");")
(~a "\t\t\tgoto err;")
(~a "\t\t}")
--- a/test.c
+++ b/test.c
@@ -28,11 +28,15 @@
r = nil;
if(ctx->r != nil){- if(off+len > ctx->r->len){- werrstr("range overflow by %d bytes", off+len - ctx->r->len);+ if(len < 0)
+ len = ctx->r->len - off;
+ if(len < 0 || off+len > ctx->r->len){+ werrstr("range overflow (len %d) by %d bytes", len, off+len - ctx->r->len);goto err;
}
off += ctx->r->start;
+ }else if(len < 0){+ len = 0x7fffffff;
}
if((r = malloc(sizeof(*r))) == nil){ werrstr("no memory");@@ -51,7 +55,6 @@
return 0;
err:
free(r);
- werrstr("ctxpushrange: %r");return -1;
}
@@ -75,7 +78,6 @@
free(r);
return 0;
err:
- werrstr("ctxpoprange: %r");return -1;
}
@@ -88,7 +90,7 @@
r = ctx->r;
if(r != nil && ctx->off+n > r->start+r->len){- werrstr("short read: need %d at %d, have %d at %d", n, ctx->off, r->len, r->start);+ werrstr("need %d at %d, have %d at %d", n, ctx->off, r->len, r->start);goto err;
}
if(n > ctx->bufsz){@@ -100,7 +102,7 @@
ctx->bufsz = n;
}
if((x = Bread(ctx->f, ctx->buf, n)) != n){- werrstr("short read: need %d, got %d; off %d", n, x, ctx->off);+ werrstr("need %d, got %d; off %d", n, x, ctx->off);goto err;
}
ctx->off += n;
@@ -107,7 +109,6 @@
return ctx->buf;
err:
- werrstr("ctxreadn: %r");return nil;
}
@@ -131,7 +132,6 @@
return 0;
err:
free(arr);
- werrstr("ctxarray: %r");return -1;
}
@@ -154,7 +154,7 @@
}else if(read_TableDirectory(&ctx, &td) != 0){fprint(2, "%s: %r\n", argv[i]);
} else {- print_TableDirectory(out, 0, &td);
+ print_TableDirectory(out, indentΔ, &td);
}
if(ctx.f != nil)
Bterm(ctx.f);