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
3 changes: 3 additions & 0 deletions javascripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ var convert = function(font){
} else {
result.cssFontStyle = "normal";
};

alert( "Three.js font-family name: " + result.familyName.toLowerCase());

return "if (_typeface_js && _typeface_js.loadFace) _typeface_js.loadFace("+ JSON.stringify(result) + ");"
};

Expand Down
34 changes: 17 additions & 17 deletions javascripts/opentype.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -877,8 +877,8 @@ function parseBuffer(buffer) {
break;
case 'name':
font.tables.name = _name.parse(data, offset);
font.familyName = font.tables.name.fontFamily;
font.styleName = font.tables.name.fontSubfamily;
font.familyName = font.tables.name.font_family_name;
font.styleName = font.tables.name.font_sub_family_name;
break;
case 'OS/2':
font.tables.os2 = os2.parse(data, offset);
Expand Down Expand Up @@ -3412,28 +3412,28 @@ var table = require('../table');
// NameIDs for the name table.
var nameTableNames = [
'copyright', // 0
'fontFamily', // 1
'fontSubfamily', // 2
'uniqueID', // 3
'fullName', // 4
'version', // 5
'postScriptName', // 6
'font_family_name', // 1
'font_sub_family_name', // 2
'unique_font_identifier', // 3
'full_font_name', // 4
'version_string', // 5
'postscript_name', // 6
'trademark', // 7
'manufacturer', // 8
'manufacturer_name', // 8
'designer', // 9
'description', // 10
'manufacturerURL', // 11
'designerURL', // 12
'manufacturer_url', // 11
'vendor_url', // 12
'licence', // 13
'licenceURL', // 14
'licence_url', // 14
'reserved', // 15
'preferredFamily', // 16
'preferredSubfamily', // 17
'preferred_family', // 16
'preferred_subfamily', // 17
'compatibleFullName', // 18
'sampleText', // 19
'postScriptFindFontName', // 20
'wwsFamily', // 21
'wwsSubfamily' // 22
'postScriptFindFontName', // 20 (?) I'm not sure of this in THREE.JS.
'wws_family', // 21
'wws_subfamily' // 22
];

// Parse the naming `name` table
Expand Down