diff options
| author | Hans Hagen <pragma@wxs.nl> | 2018-06-02 23:42:05 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2018-06-02 23:42:05 +0200 |
| commit | ac0e3262fb027e4ab586204bf2d5a05e9a831933 (patch) | |
| tree | aa43c752abe60ee65a9a9b09b32fa19ee10bd787 /tex/context/base/mkiv/font-ttf.lua | |
| parent | e52e58ff4a7007ca774905727391e5f78135f98d (diff) | |
| download | context-ac0e3262fb027e4ab586204bf2d5a05e9a831933.tar.gz | |
2018-06-02 22:41:00
Diffstat (limited to 'tex/context/base/mkiv/font-ttf.lua')
| -rw-r--r-- | tex/context/base/mkiv/font-ttf.lua | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/tex/context/base/mkiv/font-ttf.lua b/tex/context/base/mkiv/font-ttf.lua index 181bfbcc6..1365b250d 100644 --- a/tex/context/base/mkiv/font-ttf.lua +++ b/tex/context/base/mkiv/font-ttf.lua @@ -38,41 +38,49 @@ local sqrt, round = math.sqrt, math.round local char = string.char local concat = table.concat -local report = logs.reporter("otf reader","ttf") +local report = logs.reporter("otf reader","ttf") -local trace_deltas = false +local trace_deltas = false -local readers = fonts.handlers.otf.readers -local streamreader = readers.streamreader +local readers = fonts.handlers.otf.readers +local streamreader = readers.streamreader -local setposition = streamreader.setposition -local getposition = streamreader.getposition -local skipbytes = streamreader.skip -local readbyte = streamreader.readcardinal1 -- 8-bit unsigned integer -local readushort = streamreader.readcardinal2 -- 16-bit unsigned integer -local readulong = streamreader.readcardinal4 -- 24-bit unsigned integer -local readchar = streamreader.readinteger1 -- 8-bit signed integer -local readshort = streamreader.readinteger2 -- 16-bit signed integer -local read2dot14 = streamreader.read2dot14 -- 16-bit signed fixed number with the low 14 bits of fraction (2.14) (F2DOT14) -local readinteger = streamreader.readinteger1 +local setposition = streamreader.setposition +local getposition = streamreader.getposition +local skipbytes = streamreader.skip +local readbyte = streamreader.readcardinal1 -- 8-bit unsigned integer +local readushort = streamreader.readcardinal2 -- 16-bit unsigned integer +local readulong = streamreader.readcardinal4 -- 24-bit unsigned integer +local readchar = streamreader.readinteger1 -- 8-bit signed integer +local readshort = streamreader.readinteger2 -- 16-bit signed integer +local read2dot14 = streamreader.read2dot14 -- 16-bit signed fixed number with the low 14 bits of fraction (2.14) (F2DOT14) +local readinteger = streamreader.readinteger1 +local readcardinaltable = streamreader.readcardinaltable +local readintegertable = streamreader.readintegertable directives.register("fonts.streamreader",function() - streamreader = utilities.streams + streamreader = utilities.streams - setposition = streamreader.setposition - getposition = streamreader.getposition - skipbytes = streamreader.skip - readbyte = streamreader.readcardinal1 - readushort = streamreader.readcardinal2 - readulong = streamreader.readcardinal4 - readchar = streamreader.readinteger1 - readshort = streamreader.readinteger2 - read2dot14 = streamreader.read2dot14 - readinteger = streamreader.readinteger1 + setposition = streamreader.setposition + getposition = streamreader.getposition + skipbytes = streamreader.skip + readbyte = streamreader.readcardinal1 + readushort = streamreader.readcardinal2 + readulong = streamreader.readcardinal4 + readchar = streamreader.readinteger1 + readshort = streamreader.readinteger2 + read2dot14 = streamreader.read2dot14 + readinteger = streamreader.readinteger1 + readcardinaltable = streamreader.readcardinaltable + readintegertable = streamreader.readintegertable end) +local short = 2 +local ushort = 2 +local ulong = 4 + local helpers = readers.helpers local gotodatatable = helpers.gotodatatable @@ -699,13 +707,10 @@ end -- end of converter local function readglyph(f,nofcontours) -- read deltas here, saves space - local points = { } - local contours = { } - local instructions = { } - local flags = { } - for i=1,nofcontours do - contours[i] = readshort(f) + 1 - end + local points = { } + local instructions = { } + local flags = { } + local contours = readintegertable(f,nofcontours,short) local nofpoints = contours[nofcontours] local nofinstructions = readushort(f) skipbytes(f,nofinstructions) |