Bug fix for #757 - write all name table entries for fonts crafted fro…

…m scratch (#758) * Main bug fix - `for...in` loop iterates over keys in `names` object, not indexes of an array of strings - if `uniqueID` or `postScriptName` is found to be missing, update the platform that is currently being looped over, not just the `unicode` platform. * Added tests for new name table entries Test now checks for defaults for `postScriptName` and also `uniqueID` Generating a `uniqueID` now provides a fallback empty string if no `manufacturer` exists.
opentypejs · Sep 9, 2024 · f8108ec · f8108ec
1 parent 52d167f
commit f8108ec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/tables/sfnt.mjs b/src/tables/sfnt.mjs
@@ -292,16 +292,17 @@ function fontToSfntTable(font) {
     const fontNamesWindows = font.names.windows || {};
 
     // do this as a loop to reduce redundant code
-    for (const platform in ['unicode', 'macintosh', 'windows']) {
+    for (const platform in names) {
 
         names[platform] = names[platform] || {};
 
         if (!names[platform].uniqueID) {
-            names.unicode.uniqueID = {en: font.getEnglishName('manufacturer') + ':' + englishFullName};
+            const manufacturer = font.getEnglishName('manufacturer') || '';
+            names[platform].uniqueID = { en: `${manufacturer}: ${englishFullName}` };
         }
 
         if (!names[platform].postScriptName) {
-            names.unicode.postScriptName = {en: postScriptName};
+            names[platform].postScriptName = {en: postScriptName};
         }
     }
 

diff --git a/test/tables/sfnt.spec.mjs b/test/tables/sfnt.spec.mjs
@@ -1,7 +1,7 @@
 import assert from 'assert';
 import Font from '../../src/font.mjs';
-import sfnt from '../../src/tables/sfnt.mjs';
 import name from '../../src/tables/name.mjs';
+import sfnt from '../../src/tables/sfnt.mjs';
 import { encode } from '../../src/types.mjs';
 
 function encodeAndParseTable(table, parser) {
@@ -60,7 +60,8 @@ describe('tables/sfnt.mjs', function () {
                     license: { en: ' ' },
                     licenseURL: { en: ' ' },
                     preferredFamily: { en: defaultFont.familyName }, // 'MyFont'
-                    preferredSubfamily: { en: defaultFont.styleName } // 'Medium'
+                    preferredSubfamily: { en: defaultFont.styleName }, // 'Medium'
+                    uniqueID: { en: ` : ${defaultFont.familyName} ${defaultFont.styleName}` },
                 },
                 windows: {
                     copyright: { en: ' ' },
@@ -78,7 +79,8 @@ describe('tables/sfnt.mjs', function () {
                     license: { en: ' ' },
                     licenseURL: { en: ' ' },
                     preferredFamily: { en: defaultFont.familyName }, // 'MyFont'
-                    preferredSubfamily: { en: defaultFont.styleName } // 'Medium'
+                    preferredSubfamily: { en: defaultFont.styleName }, // 'Medium'
+                    uniqueID: { en: ` : ${defaultFont.familyName} ${defaultFont.styleName}` },
                 }
             });
         });
@@ -121,15 +123,19 @@ describe('tables/sfnt.mjs', function () {
                     fullName: { en: fullName },
                     version: { en: version },
                     preferredFamily: { en: preferredFamily },
-                    preferredSubfamily: { en: preferredSubfamily}
+                    preferredSubfamily: { en: preferredSubfamily },
+                    postScriptName: { en: `${fontFamily.replaceAll(' ', '')}-${fontSubfamily}` },
+                    uniqueID: { en: `: ${fontFamily} ${fontSubfamily}` },
                 },
                 windows: {
                     fontFamily: { en: fontFamily },
                     fontSubfamily: { en: fontSubfamily},
                     fullName: { en: fullName },
                     version: { en: version },
                     preferredFamily: { en: preferredFamily },
-                    preferredSubfamily: { en: preferredSubfamily}
+                    preferredSubfamily: { en: preferredSubfamily},
+                    postScriptName: { en: `${fontFamily.replaceAll(' ', '')}-${fontSubfamily}` },
+                    uniqueID: { en: `: ${fontFamily} ${fontSubfamily}` },
                 }
             });
         });