cubing 0.29.1 → 0.30.0

package/dist/esm/puzzle-geometry/index.js

@@ -1,8 +1,7 @@
 import {
   Move,
   QuantumMove
-} from "../chunk-NI7U4XAZ.js";
-import "../chunk-SBZRVSPK.js";
+} from "../chunk-ZQT3QSWD.js";
 
 // src/cubing/puzzle-geometry/FaceNameSwizzler.ts
 var FaceNameSwizzler = class {
@@ -41,7 +40,7 @@ var FaceNameSwizzler = class {
         r.push(currentMatch);
         at += this.facenames[currentMatch].length;
       } else {
-        throw new Error("Could not split " + s + " into face names.");
+        throw new Error(`Could not split ${s} into face names.`);
       }
     }
     return r;
@@ -267,7 +266,7 @@ var NxNxNCubeMapper = class {
   }
   notationToInternal(move) {
     const grip = move.family;
-    if (!move.innerLayer && !move.outerLayer) {
+    if (!(move.innerLayer || move.outerLayer)) {
       if (grip === "x") {
         move = new Move("Rv", move.amount);
       } else if (grip === "y") {
@@ -316,7 +315,7 @@ var NxNxNCubeMapper = class {
   }
   notationToExternal(move) {
     const grip = move.family;
-    if (!move.innerLayer && !move.outerLayer) {
+    if (!(move.innerLayer || move.outerLayer)) {
       if (grip === "Rv") {
         return new Move("x", move.amount);
       } else if (grip === "Uv") {
@@ -575,7 +574,7 @@ function parseOptions(argv) {
       options.puzzleOrientation = JSON.parse(argv[argp]);
       argp++;
     } else {
-      throw new Error("Bad option: " + option);
+      throw new Error(`Bad option: ${option}`);
     }
   }
   const puzzleDescription = parsePuzzleDescription(argv.slice(argp).join(" "));
@@ -662,7 +661,7 @@ var Perm = class {
     this.p = a;
   }
   toString() {
-    return "Perm[" + this.p.join(" ") + "]";
+    return `Perm[${this.p.join(" ")}]`;
   }
   mul(p2) {
     const c = Array(this.n);
@@ -705,7 +704,7 @@ var Perm = class {
         incyc.push(1 + j);
         seen[j] = true;
       }
-      cyc.push("(" + incyc.join(",") + ")");
+      cyc.push(`(${incyc.join(",")})`);
     }
     return cyc.join("");
   }
@@ -789,18 +788,18 @@ var PGOrbitsDef = class {
       }
       const pd = this.moveops[i].orbits[s];
       for (let j = 0; j < n; j++) {
-        if (pd.perm[j] != j || pd.ori[j] != 0) {
+        if (pd.perm[j] !== j || pd.ori[j] !== 0) {
           m[j].push(mvname);
         }
       }
     }
     for (let j = 0; j < n; j++) {
-      r.push("# " + (j + 1) + " " + m[j].join(" "));
+      r.push(`# ${j + 1} ${m[j].join(" ")}`);
     }
   }
   toKsolve(name, mapper = new NullMapper()) {
     const result = [];
-    result.push("Name " + name);
+    result.push(`Name ${name}`);
     result.push("");
     for (let i = 0; i < this.orbitnames.length; i++) {
       result.push(
@@ -830,10 +829,14 @@ var PGOrbitsDef = class {
         doinv = true;
         name2 = name2.substring(0, name2.length - 1);
       }
-      result.push("Move " + name2);
+      result.push(`Move ${name2}`);
       for (let j = 0; j < this.orbitnames.length; j++) {
         if (doinv) {
-          this.moveops[i].orbits[j].inv().appendDefinition(result, this.orbitnames[j], true);
+          this.moveops[i].orbits[j].inv().appendDefinition(
+            result,
+            this.orbitnames[j],
+            true
+          );
         } else {
           this.moveops[i].orbits[j].appendDefinition(
             result,
@@ -1422,47 +1425,47 @@ var PGPuzzles = {
   "20x20x20": "c f 0 f .1 f .2 f .3 f .4 f .5 f .6 f .7 f .8 f .9",
   "30x30x30": "c f 0 f .066667 f .133333 f .2 f .266667 f .333333 f .4 f .466667 f .533333 f .6 f .666667 f .733333 f .8 f .866667 f .933333",
   "40x40x40": "c f 0 f .05 f .1 f .15 f .2 f .25 f .3 f .35 f .4 f .45 f .5 f .55 f .6 f .65 f .7 f .75 f .8 f .85 f .9 f .95",
-  "skewb": "c v 0",
+  skewb: "c v 0",
   "master skewb": "c v 0.275",
   "professor skewb": "c v 0 v 0.38",
   "compy cube": "c v 0.915641442663986",
-  "helicopter": "c e 0.707106781186547",
+  helicopter: "c e 0.707106781186547",
   "curvy copter": "c e 0.83",
-  "dino": "c v 0.577350269189626",
+  dino: "c v 0.577350269189626",
   "little chop": "c e 0",
-  "pyramorphix": "t e 0",
-  "mastermorphix": "t e 0.346184634065199",
-  "pyraminx": "t v 0.333333333333333 v 1.66666666666667",
-  "tetraminx": "t v 0.333333333333333",
+  pyramorphix: "t e 0",
+  mastermorphix: "t e 0.346184634065199",
+  pyraminx: "t v 0.333333333333333 v 1.66666666666667",
+  tetraminx: "t v 0.333333333333333",
   "master pyraminx": "t v 0 v 1 v 2",
   "master tetraminx": "t v 0 v 1",
   "professor pyraminx": "t v -0.2 v 0.6 v 1.4 v 2.2",
   "professor tetraminx": "t v -0.2 v 0.6 v 1.4",
   "Jing pyraminx": "t f 0",
   "master pyramorphix": "t e 0.866025403784437",
-  "megaminx": "d f 0.7",
-  "gigaminx": "d f 0.64 f 0.82",
-  "teraminx": "d f 0.64 f 0.76 f 0.88",
-  "petaminx": "d f 0.64 f 0.73 f 0.82 f 0.91",
-  "examinx": "d f 0.64 f 0.712 f 0.784 f 0.856 f 0.928",
-  "zetaminx": "d f 0.64 f 0.7 f 0.76 f 0.82 f 0.88 f 0.94",
-  "yottaminx": "d f 0.64 f 0.6914 f 0.7429 f 0.7943 f 0.8457 f 0.8971 f 0.9486",
-  "pentultimate": "d f 0",
+  megaminx: "d f 0.7",
+  gigaminx: "d f 0.64 f 0.82",
+  teraminx: "d f 0.64 f 0.76 f 0.88",
+  petaminx: "d f 0.64 f 0.73 f 0.82 f 0.91",
+  examinx: "d f 0.64 f 0.712 f 0.784 f 0.856 f 0.928",
+  zetaminx: "d f 0.64 f 0.7 f 0.76 f 0.82 f 0.88 f 0.94",
+  yottaminx: "d f 0.64 f 0.6914 f 0.7429 f 0.7943 f 0.8457 f 0.8971 f 0.9486",
+  pentultimate: "d f 0",
   "master pentultimate": "d f 0.1",
   "elite pentultimate": "d f 0 f 0.145905",
-  "starminx": "d v 0.937962370425399",
+  starminx: "d v 0.937962370425399",
   "starminx 2": "d f 0.23606797749979",
   "pyraminx crystal": "d f 0.447213595499989",
-  "chopasaurus": "d v 0",
+  chopasaurus: "d v 0",
   "big chop": "d e 0",
   "skewb diamond": "o f 0",
-  "FTO": "o f 0.333333333333333",
+  FTO: "o f 0.333333333333333",
   "master FTO": "o f 0.5 f 0",
   "Christopher's jewel": "o v 0.577350269189626",
-  "octastar": "o e 0",
+  octastar: "o e 0",
   "Trajber's octahedron": "o v 0.433012701892219",
   "radio chop": "i f 0",
-  "icosamate": "i v 0",
+  icosamate: "i v 0",
   "icosahedron 2": "i v 0.18759247376021",
   "icosahedron 3": "i v 0.18759247376021 e 0",
   "icosahedron static faces": "i v 0.84",
@@ -2399,7 +2402,7 @@ function getmovename(geo, bits, slices) {
   let movenameFamily = geo[0];
   let movenamePrefix = "";
   if (bits[0] === 0 && bits[1] === slices) {
-    movenameFamily = movenameFamily + "v";
+    movenameFamily = `${movenameFamily}v`;
   } else if (bits[0] === bits[1]) {
     if (bits[1] > 0) {
       movenamePrefix = String(bits[1] + 1);
@@ -2433,7 +2436,7 @@ function splitByFaceNames(s, facenames) {
       r.push(currentMatch);
       at += currentMatch.length;
     } else {
-      throw new Error("Could not split " + s + " into face names.");
+      throw new Error(`Could not split ${s} into face names.`);
     }
   }
   return r;
@@ -2480,27 +2483,32 @@ var PuzzleGeometry = class {
     this.cubies = [];
     let g = null;
     switch (shape) {
-      case "c":
+      case "c": {
         g = cube();
         break;
-      case "o":
+      }
+      case "o": {
         g = octahedron();
         break;
-      case "i":
+      }
+      case "i": {
         g = icosahedron();
         break;
-      case "t":
+      }
+      case "t": {
         g = tetrahedron();
         break;
-      case "d":
+      }
+      case "d": {
         g = dodecahedron();
         break;
+      }
       default:
-        throw new Error("Bad shape argument: " + shape);
+        throw new Error(`Bad shape argument: ${shape}`);
     }
     this.rotations = closure(g);
     if (this.options.verbosity) {
-      console.log("# Rotations: " + this.rotations.length);
+      console.log(`# Rotations: ${this.rotations.length}`);
     }
     const baseplane = g[0];
     this.baseplanerot = uniqueplanes(baseplane, this.rotations);
@@ -2511,19 +2519,19 @@ var PuzzleGeometry = class {
     this.net = net;
     this.colors = defaultcolors()[baseplanes.length];
     if (this.options.verbosity > 0) {
-      console.log("# Base planes: " + baseplanes.length);
+      console.log(`# Base planes: ${baseplanes.length}`);
     }
     const baseface = getface(baseplanes);
     const zero = new Quat(0, 0, 0, 0);
     if (this.options.verbosity > 0) {
-      console.log("# Face vertices: " + baseface.length);
+      console.log(`# Face vertices: ${baseface.length}`);
     }
     const facenormal = baseplanes[0].makenormal();
     const edgenormal = baseface[0].sum(baseface[1]).makenormal();
     const vertexnormal = baseface[0].makenormal();
     const boundary = new Quat(1, facenormal.b, facenormal.c, facenormal.d);
     if (this.options.verbosity > 0) {
-      console.log("# Boundary is " + boundary);
+      console.log(`# Boundary is ${boundary}`);
     }
     const planerot = uniqueplanes(boundary, this.rotations);
     const planes = planerot.map((_) => boundary.rotateplane(_));
@@ -2539,23 +2547,26 @@ var PuzzleGeometry = class {
       let normal = null;
       let distance = 0;
       switch (cut.cutType) {
-        case "f":
+        case "f": {
           normal = facenormal;
           distance = 1;
           sawface = true;
           break;
-        case "v":
+        }
+        case "v": {
           normal = vertexnormal;
           distance = this.vertexdistance;
           sawvertex = true;
           break;
-        case "e":
+        }
+        case "e": {
           normal = edgenormal;
           distance = this.edgedistance;
           sawedge = true;
           break;
+        }
         default:
-          throw new Error("Bad cut argument: " + cut.cutType);
+          throw new Error(`Bad cut argument: ${cut.cutType}`);
       }
       cutplanes.push(normal.makecut(cut.distance));
       intersects.push(cut.distance < distance);
@@ -2711,14 +2722,14 @@ var PuzzleGeometry = class {
     }
     for (let i = 0; i < edgenames.length; i++) {
       if (edgenames[i].length !== 3) {
-        throw new Error("Bad length in edge names " + edgenames[i]);
+        throw new Error(`Bad length in edge names ${edgenames[i]}`);
       }
       const f1 = edgenames[i][1];
       const f2 = edgenames[i][2];
       let c1 = faceindextoname[f1];
       const c2 = faceindextoname[f2];
       const bits = 1 << f1 | 1 << f2;
-      if (markedface[bits] == f1) {
+      if (markedface[bits] === f1) {
         c1 = c1 + sep + c2;
       } else {
         c1 = c2 + sep + c1;
@@ -2763,9 +2774,9 @@ var PuzzleGeometry = class {
     }
     this.markedface = markedface;
     if (this.options.verbosity > 1) {
-      console.log("# Face names: " + facenames.map((_) => _[1]).join(" "));
-      console.log("# Edge names: " + edgenames.map((_) => _[1]).join(" "));
-      console.log("# Vertex names: " + vertexnames.map((_) => _[1]).join(" "));
+      console.log(`# Face names: ${facenames.map((_) => _[1]).join(" ")}`);
+      console.log(`# Edge names: ${edgenames.map((_) => _[1]).join(" ")}`);
+      console.log(`# Vertex names: ${vertexnames.map((_) => _[1]).join(" ")}`);
     }
     const geonormals = [];
     for (const faceplane of faceplanes) {
@@ -2786,7 +2797,7 @@ var PuzzleGeometry = class {
     this.swizzler.setGripNames(geonormalnames);
     if (this.options.verbosity > 0) {
       console.log(
-        "# Distances: face " + 1 + " edge " + this.edgedistance + " vertex " + this.vertexdistance
+        `# Distances: face ${1} edge ${this.edgedistance} vertex ${this.vertexdistance}`
       );
     }
     for (let c = 0; c < cutplanes.length; c++) {
@@ -2819,7 +2830,7 @@ var PuzzleGeometry = class {
     const faces = ft.collect([], true);
     this.faces = faces;
     if (this.options.verbosity > 0) {
-      console.log("# Faces is now " + faces.length);
+      console.log(`# Faces is now ${faces.length}`);
     }
     this.stickersperface = faces.length;
     const simplerot = [];
@@ -2869,7 +2880,7 @@ var PuzzleGeometry = class {
       }
     }
     if (this.options.verbosity > 0) {
-      console.log("# Short edge is " + this.shortedge);
+      console.log(`# Short edge is ${this.shortedge}`);
     }
     if (shape === "c" && sawface && !sawedge && !sawvertex) {
       this.addNotationMapper = "NxNxNCubeMapper";
@@ -2886,7 +2897,7 @@ var PuzzleGeometry = class {
         this.swizzler,
         new FaceNameSwizzler(["F", "D", "L", "BL", "R", "U", "BR", "B"])
       );
-      if (!sawedge && !sawvertex) {
+      if (!(sawedge || sawvertex)) {
         this.addNotationMapper = "FTOMapper";
       }
     }
@@ -3005,7 +3016,7 @@ var PuzzleGeometry = class {
     const t1 = tstart("allstickers");
     this.faces = expandfaces(this.baseplanerot, this.faces);
     if (this.options.verbosity > 0) {
-      console.log("# Total stickers is now " + this.faces.length);
+      console.log(`# Total stickers is now ${this.faces.length}`);
     }
     this.facecentermass = new Array(this.faces.length);
     for (let i = 0; i < this.faces.length; i++) {
@@ -3050,7 +3061,7 @@ var PuzzleGeometry = class {
     this.moveplanenormals = moveplanenormals;
     const sizes = moveplanesets.map((_) => _.length);
     if (this.options.verbosity > 0) {
-      console.log("# Move plane sets: " + sizes);
+      console.log(`# Move plane sets: ${sizes}`);
     }
     const moverotations = [];
     for (let i = 0; i < moveplanesets.length; i++) {
@@ -3161,7 +3172,7 @@ var PuzzleGeometry = class {
             console.log("# Splitting core.");
           }
           for (let suff = 0; suff < arr.length; suff++) {
-            const s2 = s + " " + suff;
+            const s2 = `${s} ${suff}`;
             facelisthash.set(s2, [arr[suff]]);
           }
         }
@@ -3169,7 +3180,7 @@ var PuzzleGeometry = class {
     }
     this.facelisthash = facelisthash;
     if (this.options.verbosity > 0) {
-      console.log("# Cubies: " + facelisthash.size);
+      console.log(`# Cubies: ${facelisthash.size}`);
     }
     const cubies = [];
     const facetocubie = [];
@@ -3349,12 +3360,12 @@ var PuzzleGeometry = class {
       }
       if (this.fixedCubie < 0) {
         throw new Error(
-          "Could not find a cubie of type " + this.options.fixedPieceType + " to fix."
+          `Could not find a cubie of type ${this.options.fixedPieceType} to fix.`
         );
       }
     }
     if (this.options.verbosity > 0) {
-      console.log("# Cubie orbit sizes " + cubieords);
+      console.log(`# Cubie orbit sizes ${cubieords}`);
     }
     tend(t1);
   }
@@ -3369,7 +3380,7 @@ var PuzzleGeometry = class {
     const re = RegExp("^(([0-9]+)-)?([0-9]+)?([^0-9]+)([0-9]+'?)?$");
     const p = mv.match(re);
     if (p === null) {
-      throw new Error("Bad move passed " + mv);
+      throw new Error(`Bad move passed ${mv}`);
     }
     const grip = p[4];
     let loslice = void 0;
@@ -3388,7 +3399,7 @@ var PuzzleGeometry = class {
     if (p[5] !== void 0) {
       amountstr = p[5];
       if (amountstr[0] === "'") {
-        amountstr = "-" + amountstr.substring(1);
+        amountstr = `-${amountstr.substring(1)}`;
       }
       amount = parseInt(amountstr, 10);
     }
@@ -3397,7 +3408,7 @@ var PuzzleGeometry = class {
   parseMove(move) {
     const bm = this.notationMapper.notationToInternal(move);
     if (bm === null) {
-      throw new Error("Bad move " + move.family);
+      throw new Error(`Bad move ${move.family}`);
     }
     move = bm;
     let grip = move.family;
@@ -3435,7 +3446,7 @@ var PuzzleGeometry = class {
       hislice = 2;
     }
     if (geo === void 0) {
-      throw new Error("Bad grip in move " + move.family);
+      throw new Error(`Bad grip in move ${move.family}`);
     }
     if (move.outerLayer !== void 0) {
       loslice = move.outerLayer;
@@ -3460,7 +3471,7 @@ var PuzzleGeometry = class {
     }
     if (loslice < 0 || loslice > this.moveplanesets[msi].length || hislice < 0 || hislice > this.moveplanesets[msi].length) {
       throw new Error(
-        "Bad slice spec " + loslice + " " + hislice + " vs " + this.moveplanesets[msi].length
+        `Bad slice spec ${loslice} ${hislice} vs ${this.moveplanesets[msi].length}`
       );
     }
     if (!permissivieMoveParsing && loslice === 0 && hislice === this.moveplanesets[msi].length && !fullrotation) {
@@ -3505,7 +3516,7 @@ var PuzzleGeometry = class {
             if (Math.abs(normal.dot(this.faces[kk].get(hii2).sub(center)) - hiv) < eps3) {
               hii = hii2;
             }
-            if (hii != 0) {
+            if (hii !== 0) {
               const qs = [];
               for (let ii = 0; ii < this.faces[kk].length; ii++) {
                 qs.push(this.faces[kk].get((ii + hii) % this.faces[kk].length));
@@ -3756,7 +3767,7 @@ var PuzzleGeometry = class {
     const r = [];
     const mvs = [];
     for (let i = 0; i < os.moveops.length; i++) {
-      let movename = "M_" + externalName(this.notationMapper, os.movenames[i]);
+      let movename = `M_${externalName(this.notationMapper, os.movenames[i])}`;
       let doinv = false;
       if (movename[movename.length - 1] === "'") {
         movename = movename.substring(0, movename.length - 1);
@@ -3764,9 +3775,9 @@ var PuzzleGeometry = class {
       }
       mvs.push(movename);
       if (doinv) {
-        r.push(movename + ":=" + os.moveops[i].toPerm().inv().toGap() + ";");
+        r.push(`${movename}:=${os.moveops[i].toPerm().inv().toGap()};`);
       } else {
-        r.push(movename + ":=" + os.moveops[i].toPerm().toGap() + ";");
+        r.push(`${movename}:=${os.moveops[i].toPerm().toGap()};`);
       }
     }
     r.push("Gen:=[");
@@ -3774,7 +3785,9 @@ var PuzzleGeometry = class {
     r.push("];");
     const ip = os.solved.identicalPieces();
     r.push(
-      "ip:=[" + ip.map((_) => "[" + _.map((__) => __ + 1).join(",") + "]").join(",") + "];"
+      `ip:=[${ip.map((_) => `[${_.map((__) => __ + 1).join(",")}]`).join(
+        ","
+      )}];`
     );
     r.push("# Size(Group(Gen));");
     r.push("# Size(Stabilizer(Group(Gen), ip, OnTuplesSets));");
@@ -3918,7 +3931,7 @@ var PuzzleGeometry = class {
       }
       hasrotation[k] = sawone;
     }
-    if (this.options.moveList && this.options.addRotations) {
+    if (this.options.addRotations && (this.options.moveList || this.options.fixedPieceType !== null)) {
       for (let i = 0; i < this.moverotations.length; i++) {
         addrot[i] = 0;
       }
@@ -4169,14 +4182,16 @@ var PuzzleGeometry = class {
       }
     }
     if (!feature1) {
-      throw new Error("Could not find feature " + feature1name);
+      throw new Error(`Could not find feature ${feature1name}`);
     }
     if (!feature2) {
-      throw new Error("Could not find feature " + feature2name);
+      throw new Error(`Could not find feature ${feature2name}`);
     }
     const r1 = feature1.pointrotation(direction1);
     const feature2rot = feature2.rotatepoint(r1);
-    const r2 = feature2rot.unproject(direction1).pointrotation(direction2.unproject(direction1));
+    const r2 = feature2rot.unproject(direction1).pointrotation(
+      direction2.unproject(direction1)
+    );
     return r2.mul(r1);
   }
   getInitial3DRotation() {
@@ -4283,7 +4298,7 @@ var PuzzleGeometry = class {
         }
       }
       if (gfi < 0) {
-        throw new Error("Could not find first face name " + f0);
+        throw new Error(`Could not find first face name ${f0}`);
       }
       const thisface = bg.facenames[gfi][0];
       for (let j = 1; j < neti.length; j++) {
@@ -4297,7 +4312,9 @@ var PuzzleGeometry = class {
         ];
         extendedges(edges2[f1], polyn);
         const caf0 = connectat[gfi];
-        const mp = thisface[(caf0 + j) % polyn].sum(thisface[(caf0 + j + polyn - 1) % polyn]).smul(0.5);
+        const mp = thisface[(caf0 + j) % polyn].sum(
+          thisface[(caf0 + j + polyn - 1) % polyn]
+        ).smul(0.5);
         const epi = findelement(bg.edgenames, mp);
         const edgename = bg.edgenames[epi][1];
         const el = splitByFaceNames(edgename, this.facenames);
@@ -4363,7 +4380,10 @@ var PuzzleGeometry = class {
   generatesvg(w = 800, h = 500, trim = 10, threed = false) {
     const mappt2d = this.generate2dmapping(w, h, trim, threed);
     function drawedges(id, pts, color) {
-      return '<polygon id="' + id + '" class="sticker" style="fill: ' + color + '" points="' + pts.map((p) => p[0] + " " + p[1]).join(" ") + '"/>\n';
+      return `<polygon id="${id}" class="sticker" style="fill: ${color}" points="${pts.map(
+        (p) => `${p[0]} ${p[1]}`
+      ).join(" ")}"/>
+`;
     }
     const pos = this.getsolved();
     const colormap = [];
@@ -4383,7 +4403,8 @@ var PuzzleGeometry = class {
     const svg = [];
     for (let j = 0; j < this.baseFaceCount; j++) {
       svg.push("<g>");
-      svg.push("<title>" + this.facenames[j][1] + "</title>\n");
+      svg.push(`<title>${this.facenames[j][1]}</title>
+`);
       for (let ii = 0; ii < this.stickersperface; ii++) {
         const i = j * this.stickersperface + ii;
         const cubie = this.facetocubie[i];
@@ -4391,18 +4412,22 @@ var PuzzleGeometry = class {
         const cubiesetnum = this.cubiesetnums[cubie];
         const cubieord = this.cubieordnums[cubie];
         const color = this.graybyori(cubie) ? "#808080" : colormap[pos.p[i]];
-        let id = this.cubiesetnames[cubiesetnum] + "-l" + cubieord + "-o" + cubieori;
+        let id = `${this.cubiesetnames[cubiesetnum]}-l${cubieord}-o${cubieori}`;
         svg.push(drawedges(id, facegeo[i], color));
         if (this.duplicatedFaces[i]) {
           for (let jj = 1; jj < this.duplicatedFaces[i]; jj++) {
-            id = this.cubiesetnames[cubiesetnum] + "-l" + cubieord + "-o" + jj;
+            id = `${this.cubiesetnames[cubiesetnum]}-l${cubieord}-o${jj}`;
             svg.push(drawedges(id, facegeo[i], color));
           }
         }
       }
       svg.push("</g>");
     }
-    const html = '<svg id="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 800 500">\n<style type="text/css"><![CDATA[.sticker { stroke: #000000; stroke-width: 1px; }]]></style>\n' + svg.join("") + "</svg>";
+    const html = `<svg id="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 800 500">
+<style type="text/css"><![CDATA[.sticker { stroke: #000000; stroke-width: 1px; }]]></style>
+${svg.join(
+      ""
+    )}</svg>`;
     return html;
   }
   get3d(options) {