resolving merge conflicts

Author: perminder-17

src/type/p5.Font.js

@@ -125,6 +125,8 @@ class Font {
       cmdContours[cmdContours.length - 1].push(cmd);
     }
 
+    return cmdContours.map((commands) => pathToPoints(commands, options, this));
+  }
   /**
       * 
       * Converts text into a 3D model that can be rendered in WebGL mode.
@@ -971,164 +973,6 @@ function font(p5, fn) {
 
     return pfont;
   }
-
-  async function create(pInst, name, path, descriptors, rawFont) {
-
-    let face = createFontFace(name, path, descriptors, rawFont);
-
-    // load if we need to
-    if (face.status !== 'loaded') await face.load();
-
-    // add it to the document
-    document.fonts.add(face);
-
-    // return a new p5.Font
-    return new p5.Font(pInst, face, name, path, rawFont);
-  }
-
-  function unquote(name) {
-    // Unquote name from CSS
-    if ((name.startsWith('"') || name.startsWith("'")) && name.at(0) === name.at(-1)) {
-      return name.slice(1, -1).replace(/\/(['"])/g, '$1');
-    }
-    return name;
-  }
-
-  function createFontFace(name, path, descriptors, rawFont) {
-
-    if (name.includes(' ')) name = "'" + name + "'"; // NOTE: must be single-quotes
-
-    let fontArg = rawFont?._data;
-    if (!fontArg) {
-      if (!validFontTypesRe.test(path)) {
-        throw Error(invalidFontError);
-      }
-      if (!path.startsWith('url(')) {
-        path = 'url(' + path + ')';
-      }
-      fontArg = path;
-    }
-
-    // create/return the FontFace object
-    let face = new FontFace(name, fontArg, descriptors);
-    if (face.status === 'error') {
-      throw Error('Failed to create FontFace for "' + name + '"');
-    }
-    return face;
-  }
-
-  function extractFontName(font, path) {
-    let result, meta = font?.name;
-
-    // use the metadata if we have it
-    if (meta) {
-      if (meta.fullName) {
-        return meta.fullName;
-      }
-      if (meta.familyName) {
-        result = meta.familyName;
-      }
-    }
-
-    if (!result) {
-
-      // if not, try to extract the name from the path
-      let matches = extractFontNameRe.exec(path);
-      if (matches && matches.length >= 3) {
-        result = matches[1];
-      }
-      else {
-        // give up and return the full path
-        result = path;
-      }
-    }
-
-    // replace spaces with underscores
-    if (result.includes(' ')) {
-      result = result.replace(/ /g, '_');
-    }
-
-    return result;
-  };
-
-  function pathToPoints(cmds, options, font) {
-
-    const parseOpts = (options, defaults) => {
-      if (typeof options !== 'object') {
-        options = defaults;
-      } else {
-        for (const key in defaults) {
-          if (typeof options[key] === 'undefined') {
-            options[key] = defaults[key];
-          }
-        }
-      }
-      return options;
-    }
-
-    const at = (v, i) => {
-      const s = v.length;
-      return v[i < 0 ? i % s + s : i % s];
-    }
-
-    const simplify = (pts, angle) => {
-      angle = angle || 0;
-      let num = 0;
-      for (let i = pts.length - 1; pts.length > 3 && i >= 0; --i) {
-        if (collinear(at(pts, i - 1), at(pts, i), at(pts, i + 1), angle)) {
-          pts.splice(i % pts.length, 1); // Remove middle point
-          num++;
-        }
-      }
-      return num;
-    }
-
-    const path = createFromCommands(arrayCommandsToObjects(cmds));
-    let opts = parseOpts(options, {
-      sampleFactor: 0.1,
-      simplifyThreshold: 0
-    });
-
-    const totalPoints = Math.ceil(path.getTotalLength() * opts.sampleFactor);
-    let points = [];
-
-    const mode = font._pInst.angleMode();
-    const DEGREES = font._pInst.DEGREES;
-    for (let i = 0; i < totalPoints; i++) {
-      const length = path.getTotalLength() * (i / (totalPoints - 1));
-      points.push({
-        ...path.getPointAtLength(length),
-        get angle() {
-          const angle = path.getAngleAtLength(length);
-          if (mode === DEGREES) {
-            return angle * 180 / Math.PI;
-          } else {
-            return angle;
-          }
-        },
-        // For backwards compatibility
-        get alpha() {
-          return this.angle;
-        }
-      });
-    }
-
-    if (opts.simplifyThreshold) {
-      simplify(points, opts.simplifyThreshold);
-    }
-
-    return points;
-  }
-
-  function unquote(name) {
-    // Unquote name from CSS
-    if ((name.startsWith('"') || name.startsWith("'")) && name.at(0) === name.at(-1)) {
-      return name.slice(1, -1).replace(/\/(['"])/g, '$1');
-    }
-    return name;
-  }
-
-
 };
 
 // Convert arrays to named objects