Merge branch 'develop'

AbstractPlay · Dec 12, 2024 · b526432 · b526432
2 parents ed4e64f + 997bf7a
commit b526432
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/renderers/_base.ts b/src/renderers/_base.ts
@@ -273,7 +273,7 @@ export abstract class RendererBase {
      */
     constructor() {
         this.options = {
-            sheets: ["core", "dice", "looney", "piecepack", "chess", "streetcar", "nato"],
+            sheets: ["core", "dice", "looney", "piecepack", "chess", "streetcar", "nato", "decktet"],
             colourContext: {
                 background: "#fff",
                 fill: "#000",
@@ -6123,7 +6123,10 @@ export abstract class RendererBase {
                     if (this.json.board !== null && this.json.board !== undefined && "strokeWeight" in this.json.board && this.json.board.strokeWeight !== undefined) {
                         strokeWeight = this.json.board.strokeWeight;
                     }
-                    let dasharray = (4 * Math.ceil(strokeWeight / (this.cellsize * 0.05))).toString();
+                    let dasharray: string|undefined;
+                    if (note.style !== "solid") {
+                        dasharray = (4 * Math.ceil(strokeWeight / (this.cellsize * 0.05))).toString();
+                    }
                     if (note.dashed !== undefined && note.dashed !== null) {
                         dasharray = (note.dashed ).join(" ");
                     }
@@ -6239,7 +6242,10 @@ export abstract class RendererBase {
                     if (this.json.board !== null && this.json.board !== undefined && "strokeWeight" in this.json.board && this.json.board.strokeWeight !== undefined) {
                         strokeWeight = this.json.board.strokeWeight;
                     }
-                    let dasharray = (4 * Math.ceil(strokeWeight / (this.cellsize * 0.05))).toString();
+                    let dasharray: string|undefined;
+                    if (note.style !== "solid") {
+                        dasharray = (4 * Math.ceil(strokeWeight / (this.cellsize * 0.05))).toString();
+                    }
                     if (note.dashed !== undefined && note.dashed !== null) {
                         dasharray = (note.dashed ).join(" ");
                     }

diff --git a/src/schemas/schema.json b/src/schemas/schema.json
@@ -398,8 +398,7 @@
                     "enum": [
                         "solid",
                         "dashed"
-                    ],
-                    "default": "solid"
+                    ]
                 },
                 "strokeWidth": {
                     "description": "The width of the line, expressed as a percentage of cell size.",