Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed fonts/firasans-medium/FiraSans-Medium.ttf
Binary file not shown.
99 changes: 0 additions & 99 deletions fonts/firasans-medium/LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
],
"devDependencies": {
"faucet": "0.0.1",
"mkdirp": "^0.5.1",
"pbf": "^1.3.1",
"tape": "^4.0.0"
},
Expand Down
133 changes: 129 additions & 4 deletions src/glyphs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ typedef std::pair<Point, Point> SegmentPair;
typedef std::pair<Box, SegmentPair> SegmentValue;
typedef bgi::rtree<SegmentValue, bgi::rstar<16>> Tree;

namespace node_fontnik
{
namespace node_fontnik {

struct FaceMetadata {
std::string family_name;
Expand Down Expand Up @@ -74,6 +73,34 @@ struct LoadBaton {
}
};

struct TableBaton {
v8::Persistent<v8::Function> callback;
v8::Persistent<v8::Object> buffer;
std::string table;
const char * font_data;
std::size_t font_size;
std::string error_name;
std::string message;
uv_work_t request;
TableBaton(v8::Local<v8::Object> buf,
std::string _table,
v8::Local<v8::Value> cb) :
table(_table),
font_data(node::Buffer::Data(buf)),
font_size(node::Buffer::Length(buf)),
error_name(),
message(),
request() {
request.data = this;
NanAssignPersistent(callback, cb.As<v8::Function>());
NanAssignPersistent(buffer, buf.As<v8::Object>());
}
~TableBaton() {
NanDisposePersistent(callback);
NanDisposePersistent(buffer);
}
};

struct RangeBaton {
v8::Persistent<v8::Function> callback;
v8::Persistent<v8::Object> buffer;
Expand Down Expand Up @@ -128,6 +155,35 @@ NAN_METHOD(Load) {
NanReturnUndefined();
}

NAN_METHOD(Table) {
NanScope();

// Validate arguments.
if (!args[0]->IsObject()) {
return NanThrowTypeError("First argument must be a font buffer");
}
v8::Local<v8::Object> obj = args[0]->ToObject();
if (obj->IsNull() || obj->IsUndefined() || !node::Buffer::HasInstance(obj)) {
return NanThrowTypeError("First argument must be a font buffer");
}

if (!args[1]->IsString()) {
return NanThrowTypeError("Second argument must be a string table name");
}
std::string table = *v8::String::Utf8Value(args[1]->ToString());
if (table.empty()) {
return NanThrowTypeError("Second argument must be a string of non-zero size");
}

if (args.Length() < 3 || !args[2]->IsFunction()) {
return NanThrowTypeError("Callback must be a function");
}

TableBaton* baton = new TableBaton(obj,table,args[2]);
uv_queue_work(uv_default_loop(), &baton->request, TableAsync, (uv_after_work_cb)AfterTable);
NanReturnUndefined();
}

NAN_METHOD(Range) {
NanScope();

Expand Down Expand Up @@ -265,6 +321,77 @@ void AfterLoad(uv_work_t* req) {
delete baton;
};

void TableAsync(uv_work_t* req) {
TableBaton* baton = static_cast<TableBaton*>(req->data);

FT_Library library = nullptr;
ft_library_guard library_guard(&library);
FT_Error error = FT_Init_FreeType(&library);
if (error) {
/* LCOV_EXCL_START */
baton->error_name = std::string("could not open FreeType library");
return;
/* LCOV_EXCL_END */
}
FT_Face ft_face = 0;
int num_faces = 0;
for ( int i = 0; ft_face == 0 || i < num_faces; ++i )
{
FT_Error face_error = FT_New_Memory_Face(library, reinterpret_cast<FT_Byte const*>(baton->font_data), static_cast<FT_Long>(baton->font_size), i, &ft_face);
if (face_error) {
baton->error_name = std::string("could not open font file");
return;
}

FT_ULong length = 0;
FT_Byte *buffer;

FT_ULong tag = FT_MAKE_TAG(baton->table.at(0),
baton->table.at(1),
baton->table.at(2),
baton->table.at(3));

face_error = FT_Load_Sfnt_Table(ft_face, tag, 0, NULL, &length);
if (face_error) {
baton->error_name = std::string("error retrieving table");
return;
}

buffer = (FT_Byte *) malloc (length);
if (buffer == NULL) {
baton->error_name = std::string("error retrieving 0-length table");
}

face_error = FT_Load_Sfnt_Table(ft_face, tag, 0, buffer, &length);
if (face_error) {
baton->error_name = std::string("error retrieving table");
return;
}
const char _message = reinterpret_cast<const char&>(buffer);

baton->message = _message;

if (ft_face) {
FT_Done_Face(ft_face);
}
}
};

void AfterTable(uv_work_t* req) {
NanScope();
TableBaton* baton = static_cast<TableBaton*>(req->data);

if (!baton->error_name.empty()) {
v8::Local<v8::Value> argv[1] = { NanError(baton->error_name.c_str()) };
NanMakeCallback(NanGetCurrentContext()->Global(), NanNew(baton->callback), 1, argv);
} else {
v8::Local<v8::Value> argv[2] = { NanNull(), NanNewBufferHandle(baton->message.data(), baton->message.size()) };
NanMakeCallback(NanGetCurrentContext()->Global(), NanNew(baton->callback), 2, argv);
}

delete baton;
};

void RangeAsync(uv_work_t* req) {
RangeBaton* baton = static_cast<RangeBaton*>(req->data);

Expand Down Expand Up @@ -349,8 +476,6 @@ void AfterRange(uv_work_t* req) {
v8::Local<v8::Value> argv[1] = { NanError(baton->error_name.c_str()) };
NanMakeCallback(NanGetCurrentContext()->Global(), NanNew(baton->callback), 1, argv);
} else {
v8::Local<v8::Array> js_faces = NanNew<v8::Array>();
unsigned idx = 0;
v8::Local<v8::Value> argv[2] = { NanNull(), NanNewBufferHandle(baton->message.data(), baton->message.size()) };
NanMakeCallback(NanGetCurrentContext()->Global(), NanNew(baton->callback), 2, argv);
}
Expand Down
7 changes: 5 additions & 2 deletions src/glyphs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,20 @@ extern "C"
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include FT_OUTLINE_H
#include FT_TRUETYPE_TABLES_H
}

namespace node_fontnik
{
namespace node_fontnik {

NAN_METHOD(Load);
void LoadAsync(uv_work_t* req);
void AfterLoad(uv_work_t* req);
NAN_METHOD(Range);
void RangeAsync(uv_work_t* req);
void AfterRange(uv_work_t* req);
NAN_METHOD(Table);
void TableAsync(uv_work_t* req);
void AfterTable(uv_work_t* req);
struct glyph_info;
void RenderSDF(glyph_info &glyph,
int size,
Expand Down
5 changes: 2 additions & 3 deletions src/node_fontnik.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
#include <node.h>
#include <nan.h>

namespace node_fontnik
{
namespace node_fontnik {

void RegisterModule(v8::Handle<v8::Object> target) {
NODE_SET_METHOD(target, "load", node_fontnik::Load);
NODE_SET_METHOD(target, "table", node_fontnik::Table);
NODE_SET_METHOD(target, "range", node_fontnik::Range);

}

NODE_MODULE(fontnik, RegisterModule);
Expand Down
1 change: 1 addition & 0 deletions test/expected/Noto Kufi Arabic Regular/codepoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[13,32,160,1536,1537,1538,1539,1547,1548,1549,1550,1551,1552,1553,1554,1555,1556,1557,1563,1566,1567,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1632,1633,1634,1635,1636,1637,1638,1639,1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,1791,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,8203,8204,8205,8206,8207,9676,64336,64337,64342,64343,64344,64345,64358,64359,64360,64361,64362,64363,64364,64365,64378,64379,64380,64381,64392,64393,64394,64395,64396,64397,64398,64399,64400,64401,64402,64403,64404,64405,64414,64415,64420,64421,64422,64423,64424,64425,64426,64427,64428,64429,64430,64431,64432,64433,64486,64487,64488,64489,64508,64509,64510,64511,64606,64607,64608,64609,64610,64611,64830,64831,65010,65020,65136,65138,65140,65142,65144,65146,65148,65150,65152,65153,65154,65155,65156,65157,65158,65159,65160,65161,65162,65163,65164,65165,65166,65167,65168,65169,65170,65171,65172,65173,65174,65175,65176,65177,65178,65179,65180,65181,65182,65183,65184,65185,65186,65187,65188,65189,65190,65191,65192,65193,65194,65195,65196,65197,65198,65199,65200,65201,65202,65203,65204,65205,65206,65207,65208,65209,65210,65211,65212,65213,65214,65215,65216,65217,65218,65219,65220,65221,65222,65223,65224,65225,65226,65227,65228,65229,65230,65231,65232,65233,65234,65235,65236,65237,65238,65239,65240,65241,65242,65243,65244,65245,65246,65247,65248,65249,65250,65251,65252,65253,65254,65255,65256,65257,65258,65259,65260,65261,65262,65263,65264,65265,65266,65267,65268,65269,65270,65271,65272,65273,65274,65275,65276,65279]
Binary file added test/expected/Noto Kufi Arabic Regular/gpos.sfnt
Binary file not shown.
1 change: 1 addition & 0 deletions test/expected/Open Sans Regular/codepoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,402,416,417,431,432,496,506,507,508,509,510,511,536,537,538,539,567,700,710,711,713,728,729,730,731,732,733,755,768,769,771,777,783,803,900,901,902,903,904,905,906,908,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,977,978,982,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,7680,7681,7742,7743,7808,7809,7810,7811,7812,7813,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,8013,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8211,8212,8213,8215,8216,8217,8218,8219,8220,8221,8222,8224,8225,8226,8230,8240,8242,8243,8249,8250,8252,8260,8304,8308,8309,8310,8311,8312,8313,8319,8355,8356,8359,8363,8364,8453,8467,8470,8480,8482,8486,8494,8539,8540,8541,8542,8706,8710,8719,8721,8722,8730,8734,8747,8776,8800,8804,8805,9674,64256,64257,64258,64259,64260,65279,65532,65533]
1 change: 1 addition & 0 deletions test/expected/Open Sans Regular/gpos.sfnt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
File renamed without changes.
Loading