Skip to content

Commit 28cb36d

Browse files
committed
make eslint happy
1 parent ec2f2f9 commit 28cb36d

File tree

2 files changed

+42
-48
lines changed

2 files changed

+42
-48
lines changed

bin/ot

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/usr/bin/env node
22
/* eslint no-console: off */
33

4-
const process = require('process')
5-
, fs = require('fs')
6-
, path = require('path')
7-
, { load, woffToOTF } = require('../dist/opentype.js')
8-
;
4+
const process = require('process'),
5+
fs = require('fs'),
6+
path = require('path'),
7+
{ load, woffToOTF } = require('../dist/opentype.js');
98

109
// Print out information about the font on the console.
1110
function printFontInfo(font) {
@@ -90,15 +89,14 @@ if (process.argv.length < 3) {
9089
}
9190
const fontpath = process.argv[3];
9291
if (!fs.existsSync(fontpath)) {
93-
console.log(`Font file at path not found.`);
92+
console.log('Font file at path not found.');
9493
process.exit(1);
9594
}
9695
const targetPath = process.argv.length >= 5
9796
? process.argv[4]
98-
: `${path.join(path.dirname(fontpath), path.basename(fontpath, path.extname(fontpath)))}.otf`
99-
, buffer = fs.readFileSync(fontpath)
100-
, result = woffToOTF(buffer)
101-
;
97+
: `${path.join(path.dirname(fontpath), path.basename(fontpath, path.extname(fontpath)))}.otf`,
98+
buffer = fs.readFileSync(fontpath),
99+
result = woffToOTF(buffer);
102100
fs.writeFileSync(targetPath, new DataView(result));
103101
} else {
104102
printUsage();

src/opentype.js

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -543,75 +543,71 @@ function loadSync(url, opt) {
543543
function woffToOTF(buffer) {
544544
if (buffer.constructor !== ArrayBuffer)
545545
buffer = new Uint8Array(buffer).buffer;
546-
const data = new DataView(buffer, 0)
547-
, out = []
548-
, signature = parse.getTag(data, 0)
549-
;
546+
const data = new DataView(buffer, 0),
547+
out = [],
548+
signature = parse.getTag(data, 0);
549+
550550

551551
if (signature !== 'wOFF')
552552
throw new Error(`TYPE ERROR signature must be wOFF but is: "${signature}"`);
553553

554-
const flavor = parse.getTag(data, 4)
555-
, numTables = parse.getUShort(data, 12)
556-
, tableEntries = parseWOFFTableEntries(data, numTables)
557-
, max = []
558-
;
554+
const flavor = parse.getTag(data, 4),
555+
numTables = parse.getUShort(data, 12),
556+
tableEntries = parseWOFFTableEntries(data, numTables),
557+
max = [];
559558
for (let n = 0; n < 64; n++) {
560559
if (Math.pow(2, n) > numTables)
561560
break;
562561
max.splice(0, Infinity, n, 2 ** n);
563562
}
564-
const searchRange = max[1] * 16
565-
, entrySelector = max[0]
566-
, rangeShift = numTables * 16 - searchRange
567-
;
563+
const searchRange = max[1] * 16,
564+
entrySelector = max[0],
565+
rangeShift = numTables * 16 - searchRange;
568566

569567
out.push(
570-
...encode.TAG(flavor)
571-
, ...encode.USHORT(numTables)
572-
, ...encode.USHORT(searchRange)
573-
, ...encode.USHORT(entrySelector)
574-
, ...encode.USHORT(rangeShift)
568+
...encode.TAG(flavor),
569+
...encode.USHORT(numTables),
570+
...encode.USHORT(searchRange),
571+
...encode.USHORT(entrySelector),
572+
...encode.USHORT(rangeShift)
575573
);
576574
let offset = out.length + numTables * 16;
577575

578576
for (let i=0; i<numTables; i++) {
579577
const tableEntry = tableEntries[i];
580578
out.push(
581-
...encode.TAG(tableEntry.tag)
582-
, ...encode.ULONG(tableEntry.checksum)
583-
, ...encode.ULONG(offset)
584-
, ...encode.ULONG(tableEntry.length)
585-
)
579+
...encode.TAG(tableEntry.tag),
580+
...encode.ULONG(tableEntry.checksum),
581+
...encode.ULONG(offset),
582+
...encode.ULONG(tableEntry.length)
583+
);
586584
tableEntry.outOffset = offset;
587585
offset += tableEntry.length;
588586
if ((offset % 4) !== 0)
589587
offset += 4 - (offset % 4);
590588
}
591-
const initialData = new Uint8Array(out.length)
592-
, buffers = [initialData]
593-
;
589+
const initialData = new Uint8Array(out.length),
590+
buffers = [initialData];
594591
for (let i=0,l=out.length; i<l; i++)
595592
initialData[i] = out[i];
596593

597594
for (let i=0; i<numTables; i++) {
598-
const tableEntry = tableEntries[i]
599-
, table = uncompressTable(data, tableEntry) // => {data: view, offset: 0};
600-
, offset = tableEntry.outOffset + tableEntry.length
601-
, padding = (offset % 4) !== 0
602-
? 4 - (offset % 4)
603-
: 0
604-
;
595+
const tableEntry = tableEntries[i],
596+
table = uncompressTable(data, tableEntry), // => {data: view, offset: 0};
597+
offset = tableEntry.outOffset + tableEntry.length,
598+
padding = (offset % 4) !== 0
599+
? 4 - (offset % 4)
600+
: 0;
605601
buffers.push(
606-
new Uint8Array(table.data.buffer, table.offset, tableEntry.length)
607-
, new Uint8Array(padding)
602+
new Uint8Array(table.data.buffer, table.offset, tableEntry.length),
603+
new Uint8Array(padding)
608604
);
609605
}
610606
const result = new Uint8Array(buffers.reduce((accum, buffer)=>accum+buffer.byteLength, 0));
611607
buffers.reduce((offset, buffer)=>{
612-
result.set(buffer, offset)
613-
return offset + buffer.byteLength
614-
}, 0)
608+
result.set(buffer, offset);
609+
return offset + buffer.byteLength;
610+
}, 0);
615611
return result.buffer;
616612
}
617613

0 commit comments

Comments
 (0)