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

morepretty

Browse source
This commit is contained in:
Ryan Oldenburg 2021-09-08 23:18:04 -05:00
parent bf322e1d33
commit 267c78756a
1 changed files with 88 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import flatty/binny, math, pixie/common, pixie/paths, sets, tables, unicode, import flatty/binny, math, pixie/common, pixie/paths, sets, strutils, tables,
vmath, strutils unicode, vmath
## See https://docs.microsoft.com/en-us/typography/opentype/spec/ ## See https://docs.microsoft.com/en-us/typography/opentype/spec/
@ -845,49 +845,71 @@ proc parseCFFIndex(buf: string, start: var int, stripZero = false): seq[string]
start = endOffset start = endOffset
const cffStandardStrings = [ const cffStandardStrings = [
".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", "quoteright", ".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
"parenleft", "parenright", "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero", "one", "two", "ampersand", "quoteright", "parenleft", "parenright", "asterisk", "plus",
"three", "four", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less", "equal", "greater", "comma", "hyphen", "period", "slash", "zero", "one", "two", "three", "four",
"question", "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "five", "six", "seven", "eight", "nine", "colon", "semicolon", "less",
"T", "U", "V", "W", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F", "G", "H",
"quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W",
"u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent", "sterling", "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum",
"fraction", "yen", "florin", "section", "currency", "quotesingle", "quotedblleft", "guillemotleft", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j",
"guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y",
"bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", "ellipsis", "perthousand", "z", "braceleft", "bar", "braceright", "asciitilde", "exclamdown", "cent",
"questiondown", "grave", "acute", "circumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "sterling", "fraction", "yen", "florin", "section", "currency", "quotesingle",
"cedilla", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash", "Oslash", "OE", "quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright", "fi",
"ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu", "fl", "endash", "dagger", "daggerdbl", "periodcentered", "paragraph",
"trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar", "degree", "thorn", "bullet", "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright",
"threequarters", "twosuperior", "registered", "minus", "eth", "multiply", "threesuperior", "copyright", "ellipsis", "perthousand", "questiondown", "grave", "acute", "circumflex",
"Aacute", "Acircumflex", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex", "tilde", "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla",
"Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave", "Ntilde", "Oacute", "Ocircumflex", "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine", "Lslash",
"Odieresis", "Ograve", "Otilde", "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash", "oslash", "oe",
"Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde", "ccedilla", "eacute", "germandbls", "onesuperior", "logicalnot", "mu", "trademark", "Eth",
"ecircumflex", "edieresis", "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "onehalf", "plusminus", "Thorn", "onequarter", "divide", "brokenbar",
"ocircumflex", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex", "udieresis", "ugrave", "degree", "thorn", "threequarters", "twosuperior", "registered", "minus",
"yacute", "ydieresis", "zcaron", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "eth", "multiply", "threesuperior", "copyright", "Aacute", "Acircumflex",
"ampersandsmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "266 ff", "onedotenleader", "Adieresis", "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex",
"zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle", "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave",
"sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior", "threequartersemdash", "periodsuperior", "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde", "Scaron",
"questionsmall", "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute", "Ydieresis",
"msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior", "tsuperior", "ff", "ffi", "ffl", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave", "aring", "atilde",
"parenleftinferior", "parenrightinferior", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "ccedilla", "eacute", "ecircumflex", "edieresis", "egrave", "iacute",
"Bsmall", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall", "icircumflex", "idieresis", "igrave", "ntilde", "oacute", "ocircumflex",
"Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "odieresis", "ograve", "otilde", "scaron", "uacute", "ucircumflex",
"Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall", "exclamdownsmall", "udieresis", "ugrave", "yacute", "ydieresis", "zcaron", "exclamsmall",
"centoldstyle", "Lslashsmall", "Scaronsmall", "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Hungarumlautsmall", "dollaroldstyle", "dollarsuperior", "ampersandsmall",
"Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall", "Cedillasmall", "Acutesmall", "parenleftsuperior", "parenrightsuperior", "266 ff",
"questiondownsmall", "oneeighth", "threeeighths", "fiveeighths", "seveneighths", "onethird", "twothirds", "onedotenleader", "zerooldstyle", "oneoldstyle", "twooldstyle",
"zerosuperior", "foursuperior", "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior", "ninesuperior", "threeoldstyle", "fouroldstyle", "fiveoldstyle", "sixoldstyle",
"zeroinferior", "oneinferior", "twoinferior", "threeinferior", "fourinferior", "fiveinferior", "sixinferior", "sevenoldstyle", "eightoldstyle", "nineoldstyle", "commasuperior",
"seveninferior", "eightinferior", "nineinferior", "centinferior", "dollarinferior", "periodinferior", "threequartersemdash", "periodsuperior", "questionsmall", "asuperior",
"commainferior", "Agravesmall", "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall", "bsuperior", "centsuperior", "dsuperior", "esuperior", "isuperior",
"Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall", "Ecircumflexsmall", "Edieresissmall", "lsuperior", "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior",
"Igravesmall", "Iacutesmall", "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall", "Ogravesmall", "tsuperior", "ff", "ffi", "ffl", "parenleftinferior", "parenrightinferior",
"Oacutesmall", "Ocircumflexsmall", "Otildesmall", "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Circumflexsmall", "hyphensuperior", "Gravesmall", "Asmall", "Bsmall",
"Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall", "Ydieresissmall", "001.000", "Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall",
"001.001", "001.002", "001.003", "Black", "Bold", "Book", "Light", "Medium", "Regular", "Roman", "Semibold"] "Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall",
"Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall",
"Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah",
"Tildesmall", "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall",
"Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall", "Dotaccentsmall",
"Macronsmall", "figuredash", "hypheninferior", "Ogoneksmall", "Ringsmall",
"Cedillasmall", "questiondownsmall", "oneeighth", "threeeighths",
"fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior",
"foursuperior", "fivesuperior", "sixsuperior", "sevensuperior",
"eightsuperior", "ninesuperior", "zeroinferior", "oneinferior", "twoinferior",
"threeinferior", "fourinferior", "fiveinferior", "sixinferior",
"seveninferior", "eightinferior", "nineinferior", "centinferior",
"dollarinferior", "periodinferior", "commainferior", "Agravesmall",
"Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall",
"Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall",
"Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall",
"Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall",
"Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall",
"Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall", "Uacutesmall",
"Ucircumflexsmall", "Udieresissmall", "Yacutesmall", "Thornsmall",
"Ydieresissmall", "001.000", "001.001", "001.002", "001.003", "Black", "Bold",
"Book", "Light", "Medium", "Regular", "Roman", "Semibold"
]
const TOP_DICT_META = { const TOP_DICT_META = {
0: "version", 0: "version",
@ -1018,7 +1040,7 @@ proc parseCFFCharstring(cff: CffTable, code: string, glyphIndex: int): Path =
y += stack.shift() y += stack.shift()
p.lineTo(x, y) p.lineTo(x, y)
if stack.len == 0: if stack.len == 0:
break break
x += stack.shift() x += stack.shift()
p.lineTo(x, y) p.lineTo(x, y)
@ -1133,7 +1155,8 @@ proc parseCFFCharstring(cff: CffTable, code: string, glyphIndex: int): Path =
i += 2 i += 2
of 29: # callgsubr of 29: # callgsubr
let codeIndex = stack.pop().int + calcCFFSubroutineBias(cff.globalSubrIndex) let codeIndex =
stack.pop().int + calcCFFSubroutineBias(cff.globalSubrIndex)
let subrCode = cff.globalSubrIndex[codeIndex] let subrCode = cff.globalSubrIndex[codeIndex]
if subrCode.len > 0: if subrCode.len > 0:
parse(subrCode) parse(subrCode)
@ -1299,20 +1322,20 @@ proc parseCFFTable(buf: string, offset: int, maxp: MaxpTable): CFFTable =
b1 shl 24 or b2 shl 16 or b3 shl 8 or b4)) b1 shl 24 or b2 shl 16 or b3 shl 8 or b4))
if b0 == 30: if b0 == 30:
return parseFloatOperand() return parseFloatOperand()
if b0 >= 32 and b0 <= 246: if b0 >= 32 and b0 <= 246:
return float64(b0 - 139) return float64(b0 - 139)
if b0 >= 247 and b0 <= 250: if b0 >= 247 and b0 <= 250:
b1 = data.readUint8(relativeOffset).int b1 = data.readUint8(relativeOffset).int
inc relativeOffset inc relativeOffset
return float64((b0 - 247) * 256 + b1 + 108) return float64((b0 - 247) * 256 + b1 + 108)
if b0 >= 251 and b0 <= 254: if b0 >= 251 and b0 <= 254:
b1 = data.readUint8(relativeOffset).int b1 = data.readUint8(relativeOffset).int
inc relativeOffset inc relativeOffset
return float64(-(b0 - 251) * 256 - b1 - 108) return float64(-(b0 - 251) * 256 - b1 - 108)
failUnsupported("Invalid b0 " & $b0) failUnsupported("Invalid b0 " & $b0)
@ -1483,10 +1506,12 @@ proc parseCFFTable(buf: string, offset: int, maxp: MaxpTable): CFFTable =
var fdArrayOffset = result.topDict.fdArray + offset var fdArrayOffset = result.topDict.fdArray + offset
var fdSelectOffset = result.topDict.fdSelect + offset var fdSelectOffset = result.topDict.fdSelect + offset
if fdArrayOffset == 0 or fdSelectOffset == 0: if fdArrayOffset == 0 or fdSelectOffset == 0:
failUnsupported("CFF CID tables are missing") failUnsupported("CFF CID tables are missing")
var fdArrayIndex = parseCFFIndex(buf, fdArrayOffset) var fdArrayIndex = parseCFFIndex(buf, fdArrayOffset)
result.topDict.fdArraySeq = result.gatherCFFTopDicts(maxp, buf, offset, fdArrayIndex, result.stringIndex) result.topDict.fdArraySeq = result.gatherCFFTopDicts(
maxp, buf, offset, fdArrayIndex, result.stringIndex
)
proc parseCFFFDSelect(buf: string, start, nGlyphs, fdArrayCount: int): seq[int] = proc parseCFFFDSelect(buf: string, start, nGlyphs, fdArrayCount: int): seq[int] =
@ -1590,8 +1615,6 @@ proc parseCFFTable(buf: string, offset: int, maxp: MaxpTable): CFFTable =
var start = offset + result.topDict.charStrings var start = offset + result.topDict.charStrings
result.charIndex = buf.parseCFFIndex(start) result.charIndex = buf.parseCFFIndex(start)
# proc parseLangSys(buf: string, offset: int): LangSys = # proc parseLangSys(buf: string, offset: int): LangSys =
# var i = offset # var i = offset
@ -1997,7 +2020,9 @@ proc parsePairPos(buf: string, offset: int): PairPos =
else: else:
failUnsupported("pair pos format") failUnsupported("pair pos format")
proc parseLookup(buf: string, offset: int, pairPosTables: var seq[PairPos]): Lookup = proc parseLookup(
buf: string, offset: int, pairPosTables: var seq[PairPos]
): Lookup =
var i = offset var i = offset
buf.eofCheck(i + 6) buf.eofCheck(i + 6)
@ -2038,7 +2063,9 @@ proc parseLookupList(buf: string, offset: int): LookupList =
var pairPosTables: seq[PairPos] var pairPosTables: seq[PairPos]
for lookupOffset in result.lookupoffsets: for lookupOffset in result.lookupoffsets:
result.lookups.add(parseLookup(buf, offset + lookupOffset.int, pairPosTables)) result.lookups.add(parseLookup(
buf, offset + lookupOffset.int, pairPosTables)
)
result.pairPosTables = pairPosTables result.pairPosTables = pairPosTables
@ -2477,7 +2504,6 @@ proc parseOpenType*(buf: string): OpenType {.raises: [PixieError].} =
else: else:
failUnsupported("glyph outlines") failUnsupported("glyph outlines")
if "kern" in result.tableRecords: if "kern" in result.tableRecords:
result.kern = parseKernTable(buf, result.tableRecords["kern"].offset.int) result.kern = parseKernTable(buf, result.tableRecords["kern"].offset.int)