Merge pull request #8084 from perminder-17/comma-included-in-loadFont

Comma included in load font

Author: davepagurek

src/type/p5.Font.js

@@ -981,10 +981,17 @@ async function create(pInst, name, path, descriptors, rawFont) {
   return new Font(pInst, face, name, path, rawFont);
 }
 
-function createFontFace(name, path, descriptors, rawFont) {
 
-  if (name.includes(' ')) name = "'" + name + "'"; // NOTE: must be single-quotes
+function sanitizeFontName(name) {
+  if (!/^[A-Za-z][A-Za-z0-9_-]*$/.test(name)) {
+    name = "'" + String(name).replace(/'/g, "\\'") + "'";
+  }
+  return name;
+}
+
+function createFontFace(name, path, descriptors, rawFont) {
 
+  name = sanitizeFontName(name);
   let fontArg = rawFont?._compressedData ?? rawFont?._data;
   if (!fontArg) {
     if (!validFontTypesRe.test(path)) {
@@ -1530,6 +1537,7 @@ export const arrayCommandsToObjects = commands => commands.map(command => {
   }
 });
 
+export { sanitizeFontName as _sanitizeFontName };
 export default font;
 
 if (typeof p5 !== 'undefined') {

test/unit/type/p5.Font.js

@@ -1,4 +1,5 @@
 import p5 from '../../../src/app.js';
+import {_sanitizeFontName} from '../../../src/type/p5.Font.js';
 
 suite('p5.Font', function () {
   var myp5;
@@ -61,3 +62,23 @@ suite('p5.Font', function () {
     });
   });
 });
+
+suite('sanitizeFontName', function () {
+  test('fully alphabetic or alpha-leading alnum do not need quotes', function () {
+    assert.equal(_sanitizeFontName('Arial'), 'Arial');
+    assert.equal(_sanitizeFontName('Family900'), 'Family900');
+    assert.equal(_sanitizeFontName('A_b-c'), 'A_b-c');
+  });
+
+  test('names starting with a digit need quotes', function () {
+    assert.equal(_sanitizeFontName('9lives'), "'9lives'");
+  });
+
+  test('names with spaces need quotes', function () {
+    assert.equal(_sanitizeFontName('My Font'), "'My Font'");
+  });
+
+  test('names with commas need quotes', function () {
+    assert.equal(_sanitizeFontName('Foo,Bar'), "'Foo,Bar'");
+  });
+});