From 5dcaa15f3233583693d93ebe1790e3e9599d5188 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Wed, 19 Apr 2023 06:08:26 +0000
Subject: [PATCH 01/11] First attempt

---
 packages/core/src/defs.mjs                    | 94 +++++++++++++++++++
 packages/core/src/svg.mjs                     |  5 +-
 plugins/plugin-annotations/src/buttons.mjs    | 20 ++--
 plugins/plugin-annotations/src/cutonfold.mjs  |  2 +-
 plugins/plugin-annotations/src/dimensions.mjs |  2 +-
 plugins/plugin-annotations/src/grainline.mjs  |  2 +-
 plugins/plugin-annotations/src/logo.mjs       |  2 +-
 plugins/plugin-annotations/src/notches.mjs    |  2 +-
 plugins/plugin-annotations/src/pleat.mjs      |  2 +-
 .../plugin-annotations/src/sewtogether.mjs    |  2 +-
 10 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100644 packages/core/src/defs.mjs

diff --git a/packages/core/src/defs.mjs b/packages/core/src/defs.mjs
new file mode 100644
index 00000000000..1e1955a2d65
--- /dev/null
+++ b/packages/core/src/defs.mjs
@@ -0,0 +1,94 @@
+//////////////////////////////////////////////
+//               CONSTRUCTOR                //
+//////////////////////////////////////////////
+
+/**
+ * Constructor for Defs
+ *
+ * @constructor
+ * @return {Defs} this - The Defs instance
+ */
+export function Defs() {
+  this.list = {}
+
+  return this
+}
+
+//////////////////////////////////////////////
+//            PUBLIC METHODS                //
+//////////////////////////////////////////////
+
+/**
+ * Return a deep copy of this
+ *
+ * @return {object} this - The Defs instance
+ */
+Defs.prototype.clone = function () {
+  let clone = new Defs()
+  clone.list = JSON.parse(JSON.stringify(this.list))
+
+  return clone
+}
+
+/**
+ * Retrieve a def
+ *
+ * @param {string} name - Name of the def to get
+ * @return value - The value under name
+ */
+Defs.prototype.get = function (name) {
+  if (typeof this.list[name] === 'undefined') return false
+  else return this.list[name]
+}
+
+/**
+ * Remove a def
+ *
+ * @param {string} name - Name of the def to set
+ * @return {object} this - The Defs instance
+ */
+Defs.prototype.remove = function (name) {
+  delete this.list[name]
+
+  return this
+}
+
+/**
+ * Return SVG code for Defs
+ *
+ * @return {string} svg - The SVG code
+ */
+Defs.prototype.render = function () {
+  let svg = ''
+  for (let key in this.list) {
+    svg += ` ${key}="${this.list[key].join('')}"`
+  }
+
+  return svg
+}
+
+/**
+ * Set a def, overwriting existing value
+ *
+ * @param {string} name - Name of the defs to set
+ * @param {string} value - Value of the defs to set
+ * @return {Defs} this - The Defs instance
+ */
+Defs.prototype.set = function (name, value) {
+  this.list[name] = [value]
+
+  return this
+}
+
+/**
+ * Sets a def, but only if it's not currently set
+ *
+ * @param {string} name - Name of the def to set
+ * @param {string} value - Value of the def to set
+ * @return {Defs} this - The Defs instance
+ */
+Defs.prototype.setIfUnset = function (name, value) {
+  if (typeof this.list[name] === 'undefined') this.list[name] = [value]
+
+  return this
+}
diff --git a/packages/core/src/svg.mjs b/packages/core/src/svg.mjs
index d77412ce6ac..0dd58f963ea 100644
--- a/packages/core/src/svg.mjs
+++ b/packages/core/src/svg.mjs
@@ -1,4 +1,5 @@
 import { Attributes } from './attributes.mjs'
+import { Defs } from './defs.mjs'
 import { __addNonEnumProp, round } from './utils.mjs'
 import { version } from '../data.mjs'
 
@@ -31,7 +32,7 @@ export function Svg(pattern) {
   this.layout = {}
   this.body = ''
   this.style = ''
-  this.defs = ''
+  this.defs = new Defs()
 }
 
 //////////////////////////////////////////////
@@ -215,7 +216,7 @@ Svg.prototype.__renderCircle = function (point) {
 Svg.prototype.__renderDefs = function () {
   let svg = '<defs>'
   this.__indent()
-  svg += this.__nl() + this.defs
+  svg += this.__nl() + this.defs.render()
   this.__outdent()
   svg += this.__nl() + '</defs>' + this.__nl()
 
diff --git a/plugins/plugin-annotations/src/buttons.mjs b/plugins/plugin-annotations/src/buttons.mjs
index e49f78c36c4..6c54b94d8ca 100644
--- a/plugins/plugin-annotations/src/buttons.mjs
+++ b/plugins/plugin-annotations/src/buttons.mjs
@@ -1,6 +1,7 @@
 const defs = [
-  // button
-  `
+  {
+    name: 'button',
+    def: `
 <g id="button">
   <circle
     cx="0" cy="0" r="3.4"
@@ -11,8 +12,10 @@ const defs = [
   <circle cx="1"  cy="1"  r="0.5" class="no-stroke fill-mark" />
   <circle cx="-1" cy="1"  r="0.5" class="no-stroke fill-mark" />
 </g>`,
-  // buttonhole
-  `
+  },
+  {
+    name: 'buttonhole',
+    def: `
 <g id="buttonhole">
   <path
     class="mark"
@@ -31,8 +34,10 @@ const defs = [
     d="M -1,0 L 1,0 L 1,10 L -1,10 z"
   />
 </g>`,
-  // snaps
-  `
+  },
+  {
+    name: 'snaps',
+    def: `
 <radialGradient id="snap-stud-grad" cx="50%" cy="50%" r="50%" fx="50%" fy="50%">
   <stop offset="30%" style="stop-color:rgb(235,235,235); stop-opacity:1"/>
   <stop offset="80%" style="stop-color:rgb(100,100,100);stop-opacity:1" />
@@ -61,6 +66,7 @@ const defs = [
     d="M -1.7,-1 L -1.7,1 M 1.7,-1 L 1.7,1" id="snap-socket-lines"
   />
 </g>`,
+  },
 ]
 
 // Export hooks
@@ -68,7 +74,7 @@ export const buttonsHooks = {
   preRender: [
     function (svg) {
       for (const def of defs) {
-        if (svg.defs.indexOf(def) === -1) svg.defs += def
+        svg.defs.setIfUnset(def.name, def.def)
       }
     },
   ],
diff --git a/plugins/plugin-annotations/src/cutonfold.mjs b/plugins/plugin-annotations/src/cutonfold.mjs
index e98ae2dd818..1a5d76073b4 100644
--- a/plugins/plugin-annotations/src/cutonfold.mjs
+++ b/plugins/plugin-annotations/src/cutonfold.mjs
@@ -11,7 +11,7 @@ const markers = `
 export const cutonfoldHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(markers) === -1) svg.defs += markers
+      svg.defs.setIfUnset('cutonfold', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/dimensions.mjs b/plugins/plugin-annotations/src/dimensions.mjs
index 52e777fc371..3e975eb0aca 100644
--- a/plugins/plugin-annotations/src/dimensions.mjs
+++ b/plugins/plugin-annotations/src/dimensions.mjs
@@ -74,7 +74,7 @@ function lleader(so, type, props, id) {
 export const dimensionsHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(markers) === -1) svg.defs += markers
+      svg.defs.setIfUnset('dimensions', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/grainline.mjs b/plugins/plugin-annotations/src/grainline.mjs
index a2203925ae9..d04267b3bde 100644
--- a/plugins/plugin-annotations/src/grainline.mjs
+++ b/plugins/plugin-annotations/src/grainline.mjs
@@ -12,7 +12,7 @@ const dflts = { text: 'grainline' }
 export const grainlineHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(markers) === -1) svg.defs += markers
+      svg.defs.setIfUnset('grainline', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/logo.mjs b/plugins/plugin-annotations/src/logo.mjs
index 92639ea4fe2..3b23908fa4b 100644
--- a/plugins/plugin-annotations/src/logo.mjs
+++ b/plugins/plugin-annotations/src/logo.mjs
@@ -5,7 +5,7 @@ const logo = (scale) =>
 export const logoHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf('id="logo"') === -1) svg.defs += logo(svg.pattern.settings[0].scale)
+      svg.defs.setIfUnset('logo', logo(svg.pattern.settings[0].scale))
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/notches.mjs b/plugins/plugin-annotations/src/notches.mjs
index 77764b38aa8..e7e33561de4 100644
--- a/plugins/plugin-annotations/src/notches.mjs
+++ b/plugins/plugin-annotations/src/notches.mjs
@@ -12,7 +12,7 @@ const markers = `
 export const notchesHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(`id="notch"`) === -1) svg.defs += markers
+      svg.defs.setIfUnset('notch', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/pleat.mjs b/plugins/plugin-annotations/src/pleat.mjs
index 0e37b1d85c0..cc0ce01eb44 100644
--- a/plugins/plugin-annotations/src/pleat.mjs
+++ b/plugins/plugin-annotations/src/pleat.mjs
@@ -8,7 +8,7 @@ const markers = `
 export const pleatHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(markers) === -1) svg.defs += markers
+      svg.defs.setIfUnset('pleat', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/sewtogether.mjs b/plugins/plugin-annotations/src/sewtogether.mjs
index 16d2a4aa3f7..54ecb06ee7f 100644
--- a/plugins/plugin-annotations/src/sewtogether.mjs
+++ b/plugins/plugin-annotations/src/sewtogether.mjs
@@ -14,7 +14,7 @@ const markers = `
 export const sewtogetherHooks = {
   preRender: [
     function (svg) {
-      if (svg.defs.indexOf(markers) === -1) svg.defs += markers
+      svg.defs.setIfUnset('sewTogether', markers)
     },
   ],
 }

From 2a3c0d11268393ea0f50f9d62ee394d0c1e27f56 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Wed, 19 Apr 2023 14:48:03 +0000
Subject: [PATCH 02/11] Tweak

---
 packages/core/src/defs.mjs | 4 +++-
 packages/core/src/svg.mjs  | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/defs.mjs b/packages/core/src/defs.mjs
index 1e1955a2d65..7cd5c5e28d6 100644
--- a/packages/core/src/defs.mjs
+++ b/packages/core/src/defs.mjs
@@ -88,7 +88,9 @@ Defs.prototype.set = function (name, value) {
  * @return {Defs} this - The Defs instance
  */
 Defs.prototype.setIfUnset = function (name, value) {
+  // console.log({defsSetIfUnset:{name:name,value:value}})
   if (typeof this.list[name] === 'undefined') this.list[name] = [value]
-
+  // console.log({list:JSON.parse(JSON.stringify(this.list))})
+  // console.log({defs:this.render()})
   return this
 }
diff --git a/packages/core/src/svg.mjs b/packages/core/src/svg.mjs
index 0dd58f963ea..f2f8f2f530f 100644
--- a/packages/core/src/svg.mjs
+++ b/packages/core/src/svg.mjs
@@ -46,6 +46,8 @@ export function Svg(pattern) {
  * @return {string} svg - The rendered SVG output
  */
 Svg.prototype.render = function () {
+  // console.log('render')
+
   this.idPrefix = this.pattern?.settings?.[0]?.idPrefix || 'fs-'
   this.__runHooks('preRender')
   if (!this.pattern.settings[0].embed) {
@@ -214,8 +216,10 @@ Svg.prototype.__renderCircle = function (point) {
  * @return {string} svg - The SVG markup for the defs block
  */
 Svg.prototype.__renderDefs = function () {
+  console.log('__renderDefs')
   let svg = '<defs>'
   this.__indent()
+  // console.log({defs:this.defs.render()})
   svg += this.__nl() + this.defs.render()
   this.__outdent()
   svg += this.__nl() + '</defs>' + this.__nl()
@@ -230,6 +234,7 @@ Svg.prototype.__renderDefs = function () {
  * @return {string} svg - The SVG markup for the head section
  */
 Svg.prototype.__renderHead = function () {
+  // console.log('__renderHead')
   let svg = this.__renderStyle()
   svg += this.__renderDefs()
   svg += this.__openGroup(this.idPrefix + 'container')
@@ -291,6 +296,7 @@ Svg.prototype.__renderPart = function (part) {
     `${this.idPrefix}stack-${this.activeStack}-part-${part.name}`,
     part.attributes
   )
+  svg += this.__openGroup(`${this.idPrefix}stack-${this.activeStack}-part-${part.name}`, part.defs)
   for (let key in part.paths) {
     let path = part.paths[key]
     if (!path.hidden) svg += this.__renderPath(path)

From 895baf48d5f3216b4d4e73b3063968025d7fd94e Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 05:43:05 +0000
Subject: [PATCH 03/11] Spelling mistake

---
 packages/core/src/attributes.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/attributes.mjs b/packages/core/src/attributes.mjs
index f04a1211b67..211c7b28fe6 100644
--- a/packages/core/src/attributes.mjs
+++ b/packages/core/src/attributes.mjs
@@ -35,7 +35,7 @@ Attributes.prototype.add = function (name, value) {
 }
 
 /**
- * Return a props object for attributes with a fiven prefix (typically used for data-text)
+ * Return a props object for attributes with a given prefix (typically used for data-text)
  *
  * @param {string} prefix - The prefix to filter attributes on
  * @return {object} props - The attributes as props

From 3e91e23ed5e338221b68e93facb974ae638f98ee Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 05:44:39 +0000
Subject: [PATCH 04/11] Working version

---
 packages/core/src/defs.mjs                       | 3 ---
 packages/core/src/svg.mjs                        | 6 ------
 sites/shared/components/workbench/draft/defs.mjs | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/core/src/defs.mjs b/packages/core/src/defs.mjs
index 7cd5c5e28d6..9fc13d25b31 100644
--- a/packages/core/src/defs.mjs
+++ b/packages/core/src/defs.mjs
@@ -88,9 +88,6 @@ Defs.prototype.set = function (name, value) {
  * @return {Defs} this - The Defs instance
  */
 Defs.prototype.setIfUnset = function (name, value) {
-  // console.log({defsSetIfUnset:{name:name,value:value}})
   if (typeof this.list[name] === 'undefined') this.list[name] = [value]
-  // console.log({list:JSON.parse(JSON.stringify(this.list))})
-  // console.log({defs:this.render()})
   return this
 }
diff --git a/packages/core/src/svg.mjs b/packages/core/src/svg.mjs
index f2f8f2f530f..0dd58f963ea 100644
--- a/packages/core/src/svg.mjs
+++ b/packages/core/src/svg.mjs
@@ -46,8 +46,6 @@ export function Svg(pattern) {
  * @return {string} svg - The rendered SVG output
  */
 Svg.prototype.render = function () {
-  // console.log('render')
-
   this.idPrefix = this.pattern?.settings?.[0]?.idPrefix || 'fs-'
   this.__runHooks('preRender')
   if (!this.pattern.settings[0].embed) {
@@ -216,10 +214,8 @@ Svg.prototype.__renderCircle = function (point) {
  * @return {string} svg - The SVG markup for the defs block
  */
 Svg.prototype.__renderDefs = function () {
-  console.log('__renderDefs')
   let svg = '<defs>'
   this.__indent()
-  // console.log({defs:this.defs.render()})
   svg += this.__nl() + this.defs.render()
   this.__outdent()
   svg += this.__nl() + '</defs>' + this.__nl()
@@ -234,7 +230,6 @@ Svg.prototype.__renderDefs = function () {
  * @return {string} svg - The SVG markup for the head section
  */
 Svg.prototype.__renderHead = function () {
-  // console.log('__renderHead')
   let svg = this.__renderStyle()
   svg += this.__renderDefs()
   svg += this.__openGroup(this.idPrefix + 'container')
@@ -296,7 +291,6 @@ Svg.prototype.__renderPart = function (part) {
     `${this.idPrefix}stack-${this.activeStack}-part-${part.name}`,
     part.attributes
   )
-  svg += this.__openGroup(`${this.idPrefix}stack-${this.activeStack}-part-${part.name}`, part.defs)
   for (let key in part.paths) {
     let path = part.paths[key]
     if (!path.hidden) svg += this.__renderPath(path)
diff --git a/sites/shared/components/workbench/draft/defs.mjs b/sites/shared/components/workbench/draft/defs.mjs
index 07cb9ab5173..92b25ee379a 100644
--- a/sites/shared/components/workbench/draft/defs.mjs
+++ b/sites/shared/components/workbench/draft/defs.mjs
@@ -49,7 +49,7 @@ const grids = {
 }
 
 export const Defs = (props) => {
-  let defs = props.svg.defs
+  let defs = props.svg.defs.render()
   if (props.settings[0].paperless) {
     defs += grids[props.settings[0].units || 'metric']
     for (let p in props.parts[0]) {

From f47e09768ed59206f885703a1f9e954c090972f5 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 17:50:36 +0000
Subject: [PATCH 05/11] spelling

---
 packages/core/src/defs.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/defs.mjs b/packages/core/src/defs.mjs
index 9fc13d25b31..dc3ab935ba0 100644
--- a/packages/core/src/defs.mjs
+++ b/packages/core/src/defs.mjs
@@ -70,8 +70,8 @@ Defs.prototype.render = function () {
 /**
  * Set a def, overwriting existing value
  *
- * @param {string} name - Name of the defs to set
- * @param {string} value - Value of the defs to set
+ * @param {string} name - Name of the def to set
+ * @param {string} value - Value of the def to set
  * @return {Defs} this - The Defs instance
  */
 Defs.prototype.set = function (name, value) {

From 9ed72e9f4543658d222fb41c5153b344f6245b83 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 18:30:40 +0000
Subject: [PATCH 06/11] Now with tests!

---
 packages/core/src/defs.mjs        |  6 +++---
 packages/core/tests/defs.test.mjs | 34 +++++++++++++++++++++++++++++++
 packages/core/tests/svg.test.mjs  |  3 ++-
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/tests/defs.test.mjs

diff --git a/packages/core/src/defs.mjs b/packages/core/src/defs.mjs
index dc3ab935ba0..e12ef530029 100644
--- a/packages/core/src/defs.mjs
+++ b/packages/core/src/defs.mjs
@@ -61,7 +61,7 @@ Defs.prototype.remove = function (name) {
 Defs.prototype.render = function () {
   let svg = ''
   for (let key in this.list) {
-    svg += ` ${key}="${this.list[key].join('')}"`
+    svg += ` ${key}="${this.list[key]}"`
   }
 
   return svg
@@ -75,7 +75,7 @@ Defs.prototype.render = function () {
  * @return {Defs} this - The Defs instance
  */
 Defs.prototype.set = function (name, value) {
-  this.list[name] = [value]
+  this.list[name] = value
 
   return this
 }
@@ -88,6 +88,6 @@ Defs.prototype.set = function (name, value) {
  * @return {Defs} this - The Defs instance
  */
 Defs.prototype.setIfUnset = function (name, value) {
-  if (typeof this.list[name] === 'undefined') this.list[name] = [value]
+  if (typeof this.list[name] === 'undefined') this.list[name] = value
   return this
 }
diff --git a/packages/core/tests/defs.test.mjs b/packages/core/tests/defs.test.mjs
new file mode 100644
index 00000000000..4ea0bb22d0d
--- /dev/null
+++ b/packages/core/tests/defs.test.mjs
@@ -0,0 +1,34 @@
+import chai from 'chai'
+import { Defs } from '../src/defs.mjs'
+
+const expect = chai.expect
+
+describe('Defs', () => {
+  let defs = new Defs()
+
+  it('Should set a def', () => {
+    defs.set('test', 'passed')
+    expect(defs.get('test')).to.equal('passed')
+  })
+
+  it('Should remove a def', () => {
+    defs.remove('test')
+    expect(defs.get('test')).to.equal(false)
+  })
+
+  it('Should only set an unset def', () => {
+    defs.setIfUnset('test', 'passed')
+    expect(defs.get('test')).to.equal('passed')
+    defs.setIfUnset('test', 'failed')
+    expect(defs.get('test')).to.equal('passed')
+  })
+
+  it('Should return false when getting an unset def', () => {
+    expect(defs.get('doNotTest')).to.equal(false)
+  })
+
+  it('Should render defs correctly', () => {
+    console.log(defs.render())
+    expect(defs.render()).to.equal(' test="passed"')
+  })
+})
diff --git a/packages/core/tests/svg.test.mjs b/packages/core/tests/svg.test.mjs
index 0306e5767f5..9f46183d618 100644
--- a/packages/core/tests/svg.test.mjs
+++ b/packages/core/tests/svg.test.mjs
@@ -2,6 +2,7 @@ import chai from 'chai'
 import chaiString from 'chai-string'
 import { Svg } from '../src/svg.mjs'
 import { Design, Attributes } from '../src/index.mjs'
+import { Defs } from '../src/defs.mjs'
 import { version } from '../data.mjs'
 import render from './fixtures/render.mjs'
 
@@ -42,7 +43,7 @@ describe('Svg', () => {
     expect(svg.freeId).to.equal(0)
     expect(svg.body).to.equal('')
     expect(svg.style).to.equal('')
-    expect(svg.defs).to.equal('')
+    expect(svg.defs instanceof Defs).to.equal(true)
     expect(svg.prefix).to.equal('<?xml version="1.0" encoding="UTF-8" standalone="no"?>')
     expect(svg.attributes.get('xmlns')).to.equal('http://www.w3.org/2000/svg')
     expect(svg.attributes.get('xmlns:svg')).to.equal('http://www.w3.org/2000/svg')

From 0213c92b0f674d6918947e3761e618a8ea467cde Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 18:55:07 +0000
Subject: [PATCH 07/11] Test fixes

---
 plugins/plugin-annotations/tests/buttons.test.mjs | 2 +-
 plugins/plugin-annotations/tests/logo.test.mjs    | 2 +-
 plugins/plugin-annotations/tests/notches.test.mjs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/plugin-annotations/tests/buttons.test.mjs b/plugins/plugin-annotations/tests/buttons.test.mjs
index ea2b28a4db3..749142c7501 100644
--- a/plugins/plugin-annotations/tests/buttons.test.mjs
+++ b/plugins/plugin-annotations/tests/buttons.test.mjs
@@ -11,7 +11,7 @@ pattern.draft().render()
 describe('Buttons Plugin Test', () => {
   for (const snippet of ['button', 'buttonhole', 'snap-stud', 'snap-socket']) {
     it(`Should add the ${snippet} snippet to defs`, () => {
-      expect(pattern.svg.defs.indexOf(`<g id="${snippet}">`)).to.not.equal(-1)
+      expect(pattern.svg.defs.render().indexOf(`<g id="${snippet}">`)).to.not.equal(-1)
     })
   }
 
diff --git a/plugins/plugin-annotations/tests/logo.test.mjs b/plugins/plugin-annotations/tests/logo.test.mjs
index 440a8f3bc9d..9f6ca4102b8 100644
--- a/plugins/plugin-annotations/tests/logo.test.mjs
+++ b/plugins/plugin-annotations/tests/logo.test.mjs
@@ -9,7 +9,7 @@ describe('Logo Plugin Tests', () => {
     const Pattern = new Design()
     const pattern = new Pattern().use(annotationsPlugin)
     pattern.draft().render()
-    expect(pattern.svg.defs).to.contain(
+    expect(pattern.svg.defs.render()).to.contain(
       '<g id="logo" transform="scale(1) translate(-23 -36)"><path class="logo"'
     )
   })
diff --git a/plugins/plugin-annotations/tests/notches.test.mjs b/plugins/plugin-annotations/tests/notches.test.mjs
index a32c45fb557..a7eb221e982 100644
--- a/plugins/plugin-annotations/tests/notches.test.mjs
+++ b/plugins/plugin-annotations/tests/notches.test.mjs
@@ -17,11 +17,11 @@ pattern.draft().render()
 
 describe('Notches Plugin Test', () => {
   it(`Should add the snippets to defs`, () => {
-    expect(pattern.svg.defs).to.contain('<g id="notch">')
+    expect(pattern.svg.defs.render()).to.contain('<g id="notch">')
   })
 
   it(`Should add the notches snippet to defs`, () => {
-    expect(pattern.svg.defs.indexOf(`<g id="notch">`)).to.not.equal(-1)
+    expect(pattern.svg.defs.render().indexOf(`<g id="notch">`)).to.not.equal(-1)
   })
 
   it('Draws a notch on an anchor point', () => {

From 9536476512de7f3f3f094ffb7c7a703f50bee8a6 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Thu, 20 Apr 2023 19:14:10 +0000
Subject: [PATCH 08/11] Implement @eriese suggestion

---
 plugins/plugin-annotations/src/buttons.mjs    | 26 +++++++++++++++----
 plugins/plugin-annotations/src/cutonfold.mjs  | 20 ++++++++++----
 plugins/plugin-annotations/src/dimensions.mjs | 21 +++++++++++----
 plugins/plugin-annotations/src/grainline.mjs  | 19 +++++++++++---
 plugins/plugin-annotations/src/notches.mjs    | 19 +++++++++++---
 plugins/plugin-annotations/src/pleat.mjs      |  2 +-
 .../plugin-annotations/src/sewtogether.mjs    | 26 ++++++++++++++-----
 7 files changed, 103 insertions(+), 30 deletions(-)

diff --git a/plugins/plugin-annotations/src/buttons.mjs b/plugins/plugin-annotations/src/buttons.mjs
index 6c54b94d8ca..690a0ce56f5 100644
--- a/plugins/plugin-annotations/src/buttons.mjs
+++ b/plugins/plugin-annotations/src/buttons.mjs
@@ -21,13 +21,21 @@ const defs = [
     class="mark"
     d="M -1,-5 L 1,-5 L 1,5 L -1,5 z"
   />
-</g>
+</g>`,
+  },
+  {
+    name: 'buttonhole-start',
+    def: `
 <g id="buttonhole-start">
   <path
     class="mark"
     d="M -1,-10 L 1,-10 L 1,0 L -1,0 z"
   />
-</g>
+</g>`,
+  },
+  {
+    name: 'buttonhole-end',
+    def: `
 <g id="buttonhole-end">
   <path
     class="mark"
@@ -36,12 +44,16 @@ const defs = [
 </g>`,
   },
   {
-    name: 'snaps',
+    name: 'snap-stud-grad',
     def: `
 <radialGradient id="snap-stud-grad" cx="50%" cy="50%" r="50%" fx="50%" fy="50%">
   <stop offset="30%" style="stop-color:rgb(235,235,235); stop-opacity:1"/>
   <stop offset="80%" style="stop-color:rgb(100,100,100);stop-opacity:1" />
-</radialGradient>
+</radialGradient>`,
+  },
+  {
+    name: 'snap-stud',
+    def: `
 <g id="snap-stud">
   <circle id="snap-stud-circle-edge" cx="0" cy="0" r="3.4"
     style="stroke:#666;fill:#dddddd;stroke-width:0.3;"
@@ -53,7 +65,11 @@ const defs = [
     id="snap-stud-lines" style="fill:none;stroke:#666; stroke-width:0.2;"
     d="M -2,0 L -3,0 M 2,0 L 3,0 M 0,2 L 0,3 M 0,-2 L 0,-3 M 1.5,1.5 L 2.1,2.1 M -1.5,1.5 L -2.1,2.1 M -1.5,-1.5 L -2.1,-2.1 M 1.5,-1.5 L 2.1,-2.1"
   />
-</g>
+</g>`,
+  },
+  {
+    name: 'snap-socket',
+    def: `
 <g id="snap-socket">
   <circle id="snap-socket-circle-edge" cx="0" cy="0" r="3.4"
     style="stroke:#666;fill:#bbbbbb;stroke-width:0.3;"
diff --git a/plugins/plugin-annotations/src/cutonfold.mjs b/plugins/plugin-annotations/src/cutonfold.mjs
index 1a5d76073b4..2ca8ab1cdb7 100644
--- a/plugins/plugin-annotations/src/cutonfold.mjs
+++ b/plugins/plugin-annotations/src/cutonfold.mjs
@@ -1,17 +1,27 @@
-const markers = `
+const defs = [
+  {
+    name: 'cutonfoldFrom',
+    def: `
 <marker orient="auto" refY="4.0" refX="0.0" id="cutonfoldFrom" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="note fill-note" d="M 0,4 L 12,0 C 10,2 10,6  12,8 z" />
-</marker>
+</marker>`,
+  },
+  {
+    name: 'cutonfoldTo',
+    def: `
 <marker orient="auto" refY="4.0" refX="12.0" id="cutonfoldTo" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="note fill-note" d="M 12,4 L 0,0 C 2,2 2,6  0,8 z" />
-</marker>
-`
+</marker>`,
+  },
+]
 
 // Export hooks
 export const cutonfoldHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('cutonfold', markers)
+      for (const def of defs) {
+        svg.defs.setIfUnset(def.name, def.def)
+      }
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/dimensions.mjs b/plugins/plugin-annotations/src/dimensions.mjs
index 3e975eb0aca..53a6032d653 100644
--- a/plugins/plugin-annotations/src/dimensions.mjs
+++ b/plugins/plugin-annotations/src/dimensions.mjs
@@ -1,11 +1,20 @@
-const markers = `
+const defs = [
+  {
+    name: 'dimensionFrom',
+    def: `
 <marker orient="auto" refY="4.0" refX="0.0" id="dimensionFrom" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="mark fill-mark" d="M 0,4 L 12,0 C 10,2 10,6  12,8 z" />
-</marker>
+</marker>`,
+  },
+  {
+    name: 'dimensionTo',
+    def: `
 <marker orient="auto" refY="4.0" refX="12.0" id="dimensionTo" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="mark fill-mark" d="M 12,4 L 0,0 C 2,2 2,6  0,8 z" />
-</marker>
-`
+</marker>`,
+  },
+]
+
 const prefix = '__paperless'
 
 function drawDimension(from, to, so, { Path, units }) {
@@ -74,7 +83,9 @@ function lleader(so, type, props, id) {
 export const dimensionsHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('dimensions', markers)
+      for (const def of defs) {
+        svg.defs.setIfUnset(def.name, def.def)
+      }
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/grainline.mjs b/plugins/plugin-annotations/src/grainline.mjs
index d04267b3bde..d7933d5b79c 100644
--- a/plugins/plugin-annotations/src/grainline.mjs
+++ b/plugins/plugin-annotations/src/grainline.mjs
@@ -1,10 +1,19 @@
-const markers = `
+const defs = [
+  {
+    name: 'grainlineFrom',
+    def: `
 <marker orient="auto" refY="4.0" refX="10.0" id="grainlineFrom" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="note fill-note" d="M 0,4 L 12,0 C 10,2 10,6  12,8 z" />
-</marker>
+</marker>`,
+  },
+  {
+    name: 'grainlineTo',
+    def: `
 <marker orient="auto" refY="4.0" refX="2.0" id="grainlineTo" style="overflow:visible;" markerWidth="12" markerHeight="8">
 	<path class="note fill-note" d="M 12,4 L 0,0 C 2,2 2,6  0,8 z" />
-</marker>`
+</marker>`,
+  },
+]
 
 const dflts = { text: 'grainline' }
 
@@ -12,7 +21,9 @@ const dflts = { text: 'grainline' }
 export const grainlineHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('grainline', markers)
+      for (const def of defs) {
+        svg.defs.setIfUnset(def.name, def.def)
+      }
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/notches.mjs b/plugins/plugin-annotations/src/notches.mjs
index e7e33561de4..f04f5c94317 100644
--- a/plugins/plugin-annotations/src/notches.mjs
+++ b/plugins/plugin-annotations/src/notches.mjs
@@ -1,18 +1,29 @@
-const markers = `
+const defs = [
+  {
+    name: 'notch',
+    def: `
 <g id="notch">
   <circle cy="0" cx="0" r="1.4" class="fill-note" />
   <circle cy="0" cx="0" r="2.8" class="note" />
-</g>
+</g>`,
+  },
+  {
+    name: 'bnotch',
+    def: `
 <g id="bnotch">
   <path d="M -1.1 -1.1 L 1.1 1.1 M 1.1 -1.1 L -1.1 1.1" class="note" />
   <circle cy="0" cx="0" r="2.8" class="note" />
-</g>`
+</g>`,
+  },
+]
 
 // Export hooks
 export const notchesHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('notch', markers)
+      for (const def of defs) {
+        svg.defs.setIfUnset(def.name, def.def)
+      }
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/pleat.mjs b/plugins/plugin-annotations/src/pleat.mjs
index cc0ce01eb44..3fe463455f0 100644
--- a/plugins/plugin-annotations/src/pleat.mjs
+++ b/plugins/plugin-annotations/src/pleat.mjs
@@ -8,7 +8,7 @@ const markers = `
 export const pleatHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('pleat', markers)
+      svg.defs.setIfUnset('pleatTo', markers)
     },
   ],
 }
diff --git a/plugins/plugin-annotations/src/sewtogether.mjs b/plugins/plugin-annotations/src/sewtogether.mjs
index 54ecb06ee7f..d17c5cebd44 100644
--- a/plugins/plugin-annotations/src/sewtogether.mjs
+++ b/plugins/plugin-annotations/src/sewtogether.mjs
@@ -1,20 +1,34 @@
-const markers = `
+const defs = [
+  {
+    name: 'sewTogetherStart',
+    def: `
 <marker id="sewTogetherStart" markerWidth="4" markerHeight="4" orient="auto" refX="0" refY="2">
   <path class="note stroke-sm" d="M4,4 L0,2 4,0" />
-</marker>
+</marker>`,
+  },
+  {
+    name: 'sewTogetherEnd',
+    def: `
 <marker id="sewTogetherEnd" markerWidth="4" markerHeight="4" orient="auto" refX="4" refY="2">
   <path class="note stroke-sm" d="M0,0 L4,2 0,4" />
-</marker>
+</marker>`,
+  },
+  {
+    name: 'sewTogetherCross',
+    def: `
 <marker id="sewTogetherCross" markerWidth="4" markerHeight="4" orient="auto" refX="2" refY="2">
   <path d="M 0,0 L 4,4 M 4,0 L 0,4" class="note stroke-sm"/>
-</marker>
-`
+</marker>`,
+  },
+]
 
 // Export hooks
 export const sewtogetherHooks = {
   preRender: [
     function (svg) {
-      svg.defs.setIfUnset('sewTogether', markers)
+      for (const def of defs) {
+        svg.defs.setIfUnset(def.name, def.def)
+      }
     },
   ],
 }

From 8887a97dd283fe862bc683405bbe002e6d92ca47 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Fri, 21 Apr 2023 03:48:37 +0000
Subject: [PATCH 09/11] @eriese recommendations

---
 packages/core/tests/svg.test.mjs              |  2 +-
 plugins/plugin-annotations/src/buttons.mjs    | 14 +-----
 plugins/plugin-annotations/src/cutonfold.mjs  | 13 +-----
 plugins/plugin-annotations/src/dimensions.mjs | 14 ++----
 plugins/plugin-annotations/src/grainline.mjs  | 14 ++----
 plugins/plugin-annotations/src/index.mjs      | 46 +++++++++++--------
 plugins/plugin-annotations/src/logo.mjs       | 19 ++++----
 plugins/plugin-annotations/src/notches.mjs    | 14 +-----
 plugins/plugin-annotations/src/pleat.mjs      | 19 ++++----
 .../plugin-annotations/src/sewtogether.mjs    | 14 +-----
 .../plugin-annotations/tests/buttons.test.mjs |  2 +-
 .../plugin-annotations/tests/logo.test.mjs    |  4 +-
 .../plugin-annotations/tests/notches.test.mjs | 10 ++--
 13 files changed, 65 insertions(+), 120 deletions(-)

diff --git a/packages/core/tests/svg.test.mjs b/packages/core/tests/svg.test.mjs
index 9f46183d618..664f6f86434 100644
--- a/packages/core/tests/svg.test.mjs
+++ b/packages/core/tests/svg.test.mjs
@@ -43,7 +43,7 @@ describe('Svg', () => {
     expect(svg.freeId).to.equal(0)
     expect(svg.body).to.equal('')
     expect(svg.style).to.equal('')
-    expect(svg.defs instanceof Defs).to.equal(true)
+    expect(svg.defs).to.be.an.instanceof(Defs)
     expect(svg.prefix).to.equal('<?xml version="1.0" encoding="UTF-8" standalone="no"?>')
     expect(svg.attributes.get('xmlns')).to.equal('http://www.w3.org/2000/svg')
     expect(svg.attributes.get('xmlns:svg')).to.equal('http://www.w3.org/2000/svg')
diff --git a/plugins/plugin-annotations/src/buttons.mjs b/plugins/plugin-annotations/src/buttons.mjs
index 690a0ce56f5..cf870fbdd4d 100644
--- a/plugins/plugin-annotations/src/buttons.mjs
+++ b/plugins/plugin-annotations/src/buttons.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export defs
+export const buttonsDefs = [
   {
     name: 'button',
     def: `
@@ -84,14 +85,3 @@ const defs = [
 </g>`,
   },
 ]
-
-// Export hooks
-export const buttonsHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
diff --git a/plugins/plugin-annotations/src/cutonfold.mjs b/plugins/plugin-annotations/src/cutonfold.mjs
index 2ca8ab1cdb7..eec457b1ee5 100644
--- a/plugins/plugin-annotations/src/cutonfold.mjs
+++ b/plugins/plugin-annotations/src/cutonfold.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export defs
+export const cutonfoldDefs = [
   {
     name: 'cutonfoldFrom',
     def: `
@@ -15,16 +16,6 @@ const defs = [
   },
 ]
 
-// Export hooks
-export const cutonfoldHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
 // Export macros
 export const cutonfoldMacros = {
   cutonfold: function (so, { points, paths, Path, complete, setCutOnFold, setGrain, scale }) {
diff --git a/plugins/plugin-annotations/src/dimensions.mjs b/plugins/plugin-annotations/src/dimensions.mjs
index 53a6032d653..a4facf35b46 100644
--- a/plugins/plugin-annotations/src/dimensions.mjs
+++ b/plugins/plugin-annotations/src/dimensions.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export defs
+export const dimensionsDefs = [
   {
     name: 'dimensionFrom',
     def: `
@@ -79,16 +80,7 @@ function lleader(so, type, props, id) {
   return point
 }
 
-// Export hooks and macros
-export const dimensionsHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
+// Export macros
 export const dimensionsMacros = {
   // horizontal
   hd: function (so, props) {
diff --git a/plugins/plugin-annotations/src/grainline.mjs b/plugins/plugin-annotations/src/grainline.mjs
index d7933d5b79c..d80bf28afd5 100644
--- a/plugins/plugin-annotations/src/grainline.mjs
+++ b/plugins/plugin-annotations/src/grainline.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export defs
+export const grainlineDefs = [
   {
     name: 'grainlineFrom',
     def: `
@@ -17,16 +18,7 @@ const defs = [
 
 const dflts = { text: 'grainline' }
 
-// Export hooks and macros
-export const grainlineHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
+// Export macros
 export const grainlineMacros = {
   grainline: function (so = {}, { points, paths, Path, complete, setGrain }) {
     if (so === false) {
diff --git a/plugins/plugin-annotations/src/index.mjs b/plugins/plugin-annotations/src/index.mjs
index 6596c99ba06..a81d61dd4a4 100644
--- a/plugins/plugin-annotations/src/index.mjs
+++ b/plugins/plugin-annotations/src/index.mjs
@@ -1,8 +1,8 @@
 import { name, version } from '../data.mjs'
-// Hooks only
-import { buttonsHooks } from './buttons.mjs'
-import { logoHooks } from './logo.mjs'
-import { notchesHooks } from './notches.mjs'
+// Defs only
+import { buttonsDefs } from './buttons.mjs'
+import { logoDefs } from './logo.mjs'
+import { notchesDefs } from './notches.mjs'
 // Macros only
 import { bannerMacros } from './banner.mjs'
 import { bannerboxMacros } from './bannerbox.mjs'
@@ -10,26 +10,36 @@ import { bartackMacros } from './bartack.mjs'
 import { crossboxMacros } from './crossbox.mjs'
 import { scaleboxMacros } from './scalebox.mjs'
 import { titleMacros } from './title.mjs'
-// Hooks and Macros
-import { cutonfoldMacros, cutonfoldHooks } from './cutonfold.mjs'
-import { dimensionsMacros, dimensionsHooks } from './dimensions.mjs'
-import { grainlineMacros, grainlineHooks } from './grainline.mjs'
-import { pleatMacros, pleatHooks } from './pleat.mjs'
-import { sewtogetherMacros, sewtogetherHooks } from './sewtogether.mjs'
+// Defs and Macros
+import { cutonfoldMacros, cutonfoldDefs } from './cutonfold.mjs'
+import { dimensionsMacros, dimensionsDefs } from './dimensions.mjs'
+import { grainlineMacros, grainlineDefs } from './grainline.mjs'
+import { pleatMacros, pleatDefs } from './pleat.mjs'
+import { sewtogetherMacros, sewtogetherDefs } from './sewtogether.mjs'
 
 export const plugin = {
   name,
   version,
   hooks: {
     preRender: [
-      ...buttonsHooks.preRender,
-      ...logoHooks.preRender,
-      ...notchesHooks.preRender,
-      ...cutonfoldHooks.preRender,
-      ...dimensionsHooks.preRender,
-      ...grainlineHooks.preRender,
-      ...pleatHooks.preRender,
-      ...sewtogetherHooks.preRender,
+      function (svg) {
+        const defs = [
+          ...buttonsDefs,
+          ...cutonfoldDefs,
+          ...dimensionsDefs,
+          ...grainlineDefs,
+          ...logoDefs,
+          ...notchesDefs,
+          ...pleatDefs,
+          ...sewtogetherDefs,
+        ]
+        for (const def of defs) {
+          svg.defs.setIfUnset(
+            def.name,
+            typeof def.def === 'function' ? def.def(svg.pattern.settings[0].scale) : def.def
+          )
+        }
+      },
     ],
   },
   macros: {
diff --git a/plugins/plugin-annotations/src/logo.mjs b/plugins/plugin-annotations/src/logo.mjs
index 3b23908fa4b..40013a0dd41 100644
--- a/plugins/plugin-annotations/src/logo.mjs
+++ b/plugins/plugin-annotations/src/logo.mjs
@@ -1,11 +1,8 @@
-const logo = (scale) =>
-  `<g id="logo" transform="scale(${scale}) translate(-23 -36)"><path class="logo" stroke="none" fill="currentColor" d="M 35.222,0 C 34.233,0.703 34.284,0.613 33.485,0.874 31.653,1.473 29.896,1.144 27.811,0.97 27.184,0.9 26.562,0.859 25.955,0.855 22.89,0.834 20.287,1.733 19.794,4.243 18.885,4.794 18.049,5.461 17.221,6.129 15.453,7.524 14.122,9.229 13.214,11.284 11.974,14.319 13.094,17.576 13.649,20.652 13.781,21.372 13.919,22.058 13.993,22.323 14.098,22.696 14.283,23.052 14.484,23.372 14.531,23.38 14.779,22.998 14.838,22.829 14.924,22.583 14.915,22.188 14.821,21.848 14.613,21.083 14.415,20.462 14.398,20.15 14.368,19.564 14.482,19.023 14.696,18.755 14.772,18.66 14.946,19.15 14.901,19.332 14.848,19.551 14.808,19.926 14.825,20.099 14.872,20.685 14.958,21.312 15.065,21.86 15.202,22.567 15.261,23.021 15.236,23.197 15.218,23.325 15.158,23.454 14.928,23.85 14.728,24.197 14.624,24.478 14.608,24.726 14.591,24.968 14.664,25.573 14.732,25.721 14.831,25.952 15.129,26.195 15.389,26.255 15.638,26.35 15.763,26.547 15.891,26.768 16.202,27.361 16.442,28.083 16.68,29.171 16.796,29.692 16.893,30.157 16.924,30.401 15.004,30.403 12.545,30.404 10.305,30.404 9.551,30.416 8.189,30.062 6.94,29.98 6.759,28.026 5.901,25.756 4.433,25.624 3.431,25.533 2.6,25.914 1.897,27.497 L 1.917,27.582 C 2.332,27.235 2.77,26.174 4.348,26.247 5.56,26.302 5.964,28.596 6.084,29.976 5.346,30.03 4.718,30.257 4.39,30.824 L 4.383,30.824 C 4.383,30.825 4.383,30.827 4.386,30.829 4.383,30.831 4.383,30.833 4.383,30.835 L 4.39,30.835 C 4.728,31.416 5.379,31.641 6.144,31.686 6.655,46.136 20.238,48 23.95,48 37.798,48 42.646,38.59 43.375,34.863 43.716,36.451 42.642,38.474 42.385,39.967 45.306,36.59 44.778,33.343 44.244,30.077 44.688,30.605 45.289,30.932 46.104,30.751 45.523,30.363 44.735,30.635 44.263,28.998 44.057,28.291 43.879,27.761 43.702,27.316 43.32,25.883 42.778,24.514 42.112,23.18 41.55,21.733 41.921,20.795 41.865,19.553 42.876,22.887 43.508,23.774 44.688,24.123 41.72,20.547 42.736,15.01 41.059,10.068 41.818,10.514 42.684,10.648 43.606,10.103 42.714,9.849 41.824,10.52 40.544,8.639 39.463,6.536 37.897,4.983 35.997,3.613 34.979,2.949 33.849,2.503 32.713,2.089 33.87,1.799 35.162,0.769 35.222,0 z M 33.281,11.107 C 34.805,11.663 36.485,13.775 36.466,15.847 L 36.466,15.933 36.466,15.963 C 36.425,18.777 35.146,20.29 35.2,22.164 35.269,24.371 36.219,25.141 36.408,25.509 36.084,24.148 35.894,22.436 36.322,21.08 36.872,19.336 37.427,17.892 37.387,16.526 37.367,16.206 37.231,15.009 37.14,14.479 38.774,16.837 36.786,20.266 37.358,22.51 38.352,26.419 42.807,26.913 41.481,34.789 40.314,41.713 32.318,46.968 24.122,46.968 18.046,46.968 7.517,43.605 6.997,31.676 8.232,31.588 9.56,31.244 10.305,31.256 12.557,31.256 15.129,31.257 17.067,31.258 17.431,32.9 17.704,33.296 19.085,34.39 20.621,35.598 20.979,35.745 23.251,35.767 25.524,35.79 26.198,35.303 28.403,33.217 28.879,32.659 29.085,31.928 29.316,31.241 31.584,31.22 33.238,31.18 34.865,31.104 36.522,31.029 36.756,31.104 39.426,30.829 36.756,30.554 36.522,30.629 34.865,30.553 33.281,30.481 31.677,30.44 29.508,30.42 29.69,29.603 29.95,28.805 30.227,28.016 30.398,27.551 30.599,27.098 30.805,26.647 L 31.03,26.577 C 31.464,26.423 31.848,26.093 32.001,25.647 32.198,25.056 32.058,24.392 31.677,23.909 31.546,23.728 31.383,23.497 31.316,23.395 31.115,23.077 31.11,22.9 31.28,21.718 31.423,20.728 31.439,20.21 31.34,19.708 31.32,19.421 31.318,18.831 31.309,18.672 31.385,18.714 31.55,19.09 31.717,19.599 31.883,20.11 31.91,20.216 31.948,20.651 31.99,21.145 31.805,21.511 31.653,22.248 31.577,22.628 31.51,22.981 31.51,23.029 31.51,23.08 31.546,23.188 31.584,23.272 31.673,23.46 31.84,23.724 31.871,23.724 32.416,23.123 32.736,22.381 33.021,21.628 33.321,20.776 33.409,19.872 33.619,18.995 33.789,18.231 33.985,17.466 34.046,16.682 34.169,15.152 34.097,14.072 33.759,12.478 33.678,12.118 33.444,11.431 33.281,11.107 z M 27.921,18.644 C 28.506,18.637 29.085,18.708 29.636,18.867 30.385,19.154 30.49,19.823 30.628,20.574 30.705,21.054 30.702,21.399 30.615,21.963 30.554,22.781 30.229,23.414 29.519,23.859 28.448,24.057 27.303,24.248 26.395,23.539 25.633,22.489 25.174,21.162 25.349,19.868 25.46,19.337 25.707,19.061 26.215,18.896 26.762,18.739 27.341,18.653 27.921,18.644 z M 19.038,18.739 C 19.585,18.734 20.138,18.792 20.442,18.986 21.747,19.869 21.328,21.306 20.812,22.567 20.061,24.218 18.437,24.157 16.863,24.144 15.992,23.889 15.912,23.175 15.786,22.412 15.678,21.675 15.448,20.885 15.64,20.144 16.133,18.952 17.935,18.815 19.038,18.739 z M 38.941,18.945 C 38.948,22.118 39.49,23.677 40.578,25.924 39.937,24.701 39.021,24.005 38.68,22.543 38.028,19.72 38.731,19.878 38.941,18.945 z M 23.128,21.243 C 23.3,21.417 23.383,21.657 23.532,21.848 23.647,21.651 23.765,21.455 23.913,21.28 23.99,21.282 24.084,21.434 24.169,21.706 24.533,22.712 24.604,23.819 25.076,24.786 25.517,25.486 24.915,25.894 24.254,25.926 23.772,25.925 23.568,25.596 23.285,25.27 23.212,25.483 23.073,25.62 22.907,25.764 22.485,26.118 21.658,25.987 21.53,25.429 21.7,24.363 22.243,23.384 22.599,22.362 22.776,21.989 22.778,21.703 23.128,21.243 z M 16.936,26.628 C 17.149,26.628 17.734,27.025 17.853,27.249 17.935,27.398 18.122,27.978 18.135,28.119 18.156,28.287 18.105,28.685 18.053,28.793 18.015,28.87 17.986,28.881 17.942,28.831 17.905,28.789 17.415,27.849 17.102,27.227 16.856,26.729 16.83,26.628 16.936,26.628 z M 29.158,26.939 C 29.166,26.94 29.178,26.943 29.189,26.946 29.255,26.973 29.209,27.207 28.961,28.057 28.914,28.313 28.8,28.515 28.633,28.683 28.578,28.683 28.553,28.619 28.467,28.264 28.394,27.961 28.386,27.691 28.437,27.449 28.525,27.146 28.881,27.053 29.158,26.939 z M 27.675,28.792 C 27.696,28.788 27.716,28.799 27.742,28.82 27.832,28.883 27.845,29.049 27.785,29.374 27.712,29.792 27.696,29.838 27.588,29.881 27.541,29.902 27.457,29.917 27.401,29.917 27.3,29.899 27.274,29.817 27.298,29.693 27.298,29.433 27.374,29.207 27.546,28.94 27.611,28.84 27.644,28.797 27.675,28.792 z M 19.042,28.811 C 19.111,28.811 19.319,28.961 19.396,29.065 19.482,29.175 19.58,29.83 19.525,29.943 19.462,30.085 19.154,30.014 19.069,29.837 19.017,29.731 18.894,29.159 18.894,29.023 18.894,28.897 18.955,28.811 19.042,28.811 z M 26.933,28.984 C 27.017,29.104 27.039,29.258 27.021,29.596 L 27.004,29.904 26.916,29.992 C 26.863,30.041 26.773,30.101 26.719,30.126 26.6,30.182 26.509,30.187 26.492,30.142 26.472,30.082 26.506,29.7 26.543,29.571 26.586,29.438 26.779,29.041 26.843,28.957 26.872,28.88 26.906,28.976 26.933,28.984 z M 21.912,28.966 C 22.093,29.012 22.173,29.175 22.272,29.323 L 22.339,29.455 22.245,29.782 C 22.195,29.962 22.142,30.124 22.126,30.142 22.108,30.162 22.041,30.172 21.942,30.171 21.678,30.164 21.648,30.153 21.577,30.045 L 21.511,29.947 21.567,29.672 C 21.648,29.276 21.687,29.157 21.777,29.055 21.824,29 21.871,28.97 21.912,28.966 z M 20.241,29.249 20.39,29.398 20.415,29.735 C 20.428,29.919 20.434,30.09 20.424,30.111 20.415,30.14 20.361,30.148 20.194,30.148 L 19.977,30.148 C 19.861,30.021 19.825,29.866 19.776,29.706 19.662,29.225 19.662,29.006 19.78,28.977 19.973,28.989 20.1,29.129 20.241,29.249 z M 26.041,29.018 C 26.277,29.081 26.23,29.456 26.229,29.724 26.211,30.158 26.194,30.248 26.138,30.304 26.041,30.401 25.771,30.347 25.64,30.203 25.597,30.151 25.593,30.135 25.627,29.924 25.666,29.667 25.716,29.507 25.827,29.287 25.908,29.129 25.984,29.03 26.041,29.018 z M 20.715,29.038 C 20.728,29.037 20.749,29.038 20.769,29.04 20.919,29.052 21.059,29.15 21.183,29.33 L 21.283,29.477 C 21.292,29.718 21.283,29.972 21.24,30.196 21.214,30.209 21.106,30.229 21,30.239 20.816,30.256 20.799,30.252 20.735,30.196 20.646,30.12 20.621,29.979 20.599,29.511 20.586,29.129 20.595,29.044 20.715,29.038 z M 22.984,29.118 C 23.145,29.152 23.247,29.238 23.292,29.379 23.328,29.5 23.35,30.177 23.315,30.224 23.303,30.244 23.227,30.269 23.14,30.28 22.816,30.321 22.53,30.29 22.502,30.213 22.466,30.125 22.707,29.253 22.796,29.145 22.834,29.061 22.926,29.126 22.984,29.118 z M 25.082,29.124 C 25.153,29.117 25.229,29.185 25.303,29.33 25.363,29.451 25.372,29.493 25.372,29.764 25.372,29.98 25.359,30.073 25.336,30.093 25.316,30.109 25.235,30.138 25.149,30.16 24.999,30.199 24.966,30.203 24.919,30.187 L 24.694,30.146 24.711,30.012 C 24.727,29.837 24.842,29.449 24.923,29.281 24.971,29.181 25.026,29.131 25.082,29.124 z M 24.104,29.127 C 24.151,29.125 24.173,29.136 24.203,29.169 24.274,29.253 24.364,29.501 24.421,29.766 24.497,30.139 24.497,30.138 24.334,30.187 24.263,30.209 24.113,30.232 24.006,30.238 23.653,30.256 23.626,30.235 23.669,29.923 23.703,29.645 23.84,29.207 23.899,29.175 23.963,29.141 24.037,29.142 24.104,29.127 z M 6.111,30.536 C 6.114,30.535 6.118,30.536 6.118,30.536 6.127,30.731 6.127,30.928 6.131,31.124 5.636,31.086 5.272,30.968 5.272,30.829 5.272,30.692 5.623,30.575 6.111,30.536 z M 6.976,30.553 C 7.377,30.603 7.654,30.708 7.649,30.829 7.649,30.951 7.381,31.055 6.983,31.104 6.979,30.921 6.979,30.737 6.976,30.553 z M 25.702,31.086 C 25.736,31.083 25.751,31.08 25.803,31.085 26.011,31.106 26.041,31.119 26.041,31.189 26.041,31.281 25.883,31.558 25.776,31.654 25.726,31.702 25.657,31.742 25.633,31.742 25.513,31.742 25.443,31.489 25.499,31.256 25.533,31.13 25.595,31.091 25.702,31.086 z M 24.947,31.169 C 25.04,31.161 25.13,31.186 25.22,31.198 25.194,31.461 25.076,31.676 24.857,31.819 24.803,31.819 24.776,31.716 24.776,31.491 24.776,31.223 24.79,31.172 24.947,31.169 z M 24.119,31.266 C 24.312,31.266 24.482,31.275 24.49,31.286 24.526,31.32 24.422,31.578 24.269,31.84 24.138,32.073 24.119,32.09 24.038,32.096 23.72,32.06 23.729,31.687 23.68,31.431 23.68,31.279 23.714,31.266 24.119,31.266 z M 21.11,31.295 C 21.331,31.299 21.417,31.332 21.417,31.417 21.417,31.525 21.335,31.74 21.288,31.767 21.217,31.806 21.211,31.804 21.071,31.658 20.85,31.41 20.825,31.364 21.11,31.295 z M 22.174,31.306 C 22.178,31.312 22.221,31.39 22.264,31.478 22.358,31.661 22.365,31.741 22.298,31.802 22.14,31.892 22.107,31.841 21.964,31.75 21.798,31.593 21.667,31.382 21.71,31.338 21.858,31.285 22.021,31.305 22.174,31.306 z M 22.596,31.311 22.991,31.318 C 23.145,31.318 23.278,31.326 23.285,31.338 23.312,31.362 23.225,31.876 23.178,31.992 23.124,32.122 22.935,32.123 22.837,31.969 22.697,31.748 22.605,31.562 22.602,31.434 L 22.596,31.311 z" /></g>`
-
-// Export hooks
-export const logoHooks = {
-  preRender: [
-    function (svg) {
-      svg.defs.setIfUnset('logo', logo(svg.pattern.settings[0].scale))
-    },
-  ],
-}
+// Export defs
+export const logoDefs = [
+  {
+    name: 'logo',
+    def: (scale) =>
+      `<g id="logo" transform="scale(${scale}) translate(-23 -36)"><path class="logo" stroke="none" fill="currentColor" d="M 35.222,0 C 34.233,0.703 34.284,0.613 33.485,0.874 31.653,1.473 29.896,1.144 27.811,0.97 27.184,0.9 26.562,0.859 25.955,0.855 22.89,0.834 20.287,1.733 19.794,4.243 18.885,4.794 18.049,5.461 17.221,6.129 15.453,7.524 14.122,9.229 13.214,11.284 11.974,14.319 13.094,17.576 13.649,20.652 13.781,21.372 13.919,22.058 13.993,22.323 14.098,22.696 14.283,23.052 14.484,23.372 14.531,23.38 14.779,22.998 14.838,22.829 14.924,22.583 14.915,22.188 14.821,21.848 14.613,21.083 14.415,20.462 14.398,20.15 14.368,19.564 14.482,19.023 14.696,18.755 14.772,18.66 14.946,19.15 14.901,19.332 14.848,19.551 14.808,19.926 14.825,20.099 14.872,20.685 14.958,21.312 15.065,21.86 15.202,22.567 15.261,23.021 15.236,23.197 15.218,23.325 15.158,23.454 14.928,23.85 14.728,24.197 14.624,24.478 14.608,24.726 14.591,24.968 14.664,25.573 14.732,25.721 14.831,25.952 15.129,26.195 15.389,26.255 15.638,26.35 15.763,26.547 15.891,26.768 16.202,27.361 16.442,28.083 16.68,29.171 16.796,29.692 16.893,30.157 16.924,30.401 15.004,30.403 12.545,30.404 10.305,30.404 9.551,30.416 8.189,30.062 6.94,29.98 6.759,28.026 5.901,25.756 4.433,25.624 3.431,25.533 2.6,25.914 1.897,27.497 L 1.917,27.582 C 2.332,27.235 2.77,26.174 4.348,26.247 5.56,26.302 5.964,28.596 6.084,29.976 5.346,30.03 4.718,30.257 4.39,30.824 L 4.383,30.824 C 4.383,30.825 4.383,30.827 4.386,30.829 4.383,30.831 4.383,30.833 4.383,30.835 L 4.39,30.835 C 4.728,31.416 5.379,31.641 6.144,31.686 6.655,46.136 20.238,48 23.95,48 37.798,48 42.646,38.59 43.375,34.863 43.716,36.451 42.642,38.474 42.385,39.967 45.306,36.59 44.778,33.343 44.244,30.077 44.688,30.605 45.289,30.932 46.104,30.751 45.523,30.363 44.735,30.635 44.263,28.998 44.057,28.291 43.879,27.761 43.702,27.316 43.32,25.883 42.778,24.514 42.112,23.18 41.55,21.733 41.921,20.795 41.865,19.553 42.876,22.887 43.508,23.774 44.688,24.123 41.72,20.547 42.736,15.01 41.059,10.068 41.818,10.514 42.684,10.648 43.606,10.103 42.714,9.849 41.824,10.52 40.544,8.639 39.463,6.536 37.897,4.983 35.997,3.613 34.979,2.949 33.849,2.503 32.713,2.089 33.87,1.799 35.162,0.769 35.222,0 z M 33.281,11.107 C 34.805,11.663 36.485,13.775 36.466,15.847 L 36.466,15.933 36.466,15.963 C 36.425,18.777 35.146,20.29 35.2,22.164 35.269,24.371 36.219,25.141 36.408,25.509 36.084,24.148 35.894,22.436 36.322,21.08 36.872,19.336 37.427,17.892 37.387,16.526 37.367,16.206 37.231,15.009 37.14,14.479 38.774,16.837 36.786,20.266 37.358,22.51 38.352,26.419 42.807,26.913 41.481,34.789 40.314,41.713 32.318,46.968 24.122,46.968 18.046,46.968 7.517,43.605 6.997,31.676 8.232,31.588 9.56,31.244 10.305,31.256 12.557,31.256 15.129,31.257 17.067,31.258 17.431,32.9 17.704,33.296 19.085,34.39 20.621,35.598 20.979,35.745 23.251,35.767 25.524,35.79 26.198,35.303 28.403,33.217 28.879,32.659 29.085,31.928 29.316,31.241 31.584,31.22 33.238,31.18 34.865,31.104 36.522,31.029 36.756,31.104 39.426,30.829 36.756,30.554 36.522,30.629 34.865,30.553 33.281,30.481 31.677,30.44 29.508,30.42 29.69,29.603 29.95,28.805 30.227,28.016 30.398,27.551 30.599,27.098 30.805,26.647 L 31.03,26.577 C 31.464,26.423 31.848,26.093 32.001,25.647 32.198,25.056 32.058,24.392 31.677,23.909 31.546,23.728 31.383,23.497 31.316,23.395 31.115,23.077 31.11,22.9 31.28,21.718 31.423,20.728 31.439,20.21 31.34,19.708 31.32,19.421 31.318,18.831 31.309,18.672 31.385,18.714 31.55,19.09 31.717,19.599 31.883,20.11 31.91,20.216 31.948,20.651 31.99,21.145 31.805,21.511 31.653,22.248 31.577,22.628 31.51,22.981 31.51,23.029 31.51,23.08 31.546,23.188 31.584,23.272 31.673,23.46 31.84,23.724 31.871,23.724 32.416,23.123 32.736,22.381 33.021,21.628 33.321,20.776 33.409,19.872 33.619,18.995 33.789,18.231 33.985,17.466 34.046,16.682 34.169,15.152 34.097,14.072 33.759,12.478 33.678,12.118 33.444,11.431 33.281,11.107 z M 27.921,18.644 C 28.506,18.637 29.085,18.708 29.636,18.867 30.385,19.154 30.49,19.823 30.628,20.574 30.705,21.054 30.702,21.399 30.615,21.963 30.554,22.781 30.229,23.414 29.519,23.859 28.448,24.057 27.303,24.248 26.395,23.539 25.633,22.489 25.174,21.162 25.349,19.868 25.46,19.337 25.707,19.061 26.215,18.896 26.762,18.739 27.341,18.653 27.921,18.644 z M 19.038,18.739 C 19.585,18.734 20.138,18.792 20.442,18.986 21.747,19.869 21.328,21.306 20.812,22.567 20.061,24.218 18.437,24.157 16.863,24.144 15.992,23.889 15.912,23.175 15.786,22.412 15.678,21.675 15.448,20.885 15.64,20.144 16.133,18.952 17.935,18.815 19.038,18.739 z M 38.941,18.945 C 38.948,22.118 39.49,23.677 40.578,25.924 39.937,24.701 39.021,24.005 38.68,22.543 38.028,19.72 38.731,19.878 38.941,18.945 z M 23.128,21.243 C 23.3,21.417 23.383,21.657 23.532,21.848 23.647,21.651 23.765,21.455 23.913,21.28 23.99,21.282 24.084,21.434 24.169,21.706 24.533,22.712 24.604,23.819 25.076,24.786 25.517,25.486 24.915,25.894 24.254,25.926 23.772,25.925 23.568,25.596 23.285,25.27 23.212,25.483 23.073,25.62 22.907,25.764 22.485,26.118 21.658,25.987 21.53,25.429 21.7,24.363 22.243,23.384 22.599,22.362 22.776,21.989 22.778,21.703 23.128,21.243 z M 16.936,26.628 C 17.149,26.628 17.734,27.025 17.853,27.249 17.935,27.398 18.122,27.978 18.135,28.119 18.156,28.287 18.105,28.685 18.053,28.793 18.015,28.87 17.986,28.881 17.942,28.831 17.905,28.789 17.415,27.849 17.102,27.227 16.856,26.729 16.83,26.628 16.936,26.628 z M 29.158,26.939 C 29.166,26.94 29.178,26.943 29.189,26.946 29.255,26.973 29.209,27.207 28.961,28.057 28.914,28.313 28.8,28.515 28.633,28.683 28.578,28.683 28.553,28.619 28.467,28.264 28.394,27.961 28.386,27.691 28.437,27.449 28.525,27.146 28.881,27.053 29.158,26.939 z M 27.675,28.792 C 27.696,28.788 27.716,28.799 27.742,28.82 27.832,28.883 27.845,29.049 27.785,29.374 27.712,29.792 27.696,29.838 27.588,29.881 27.541,29.902 27.457,29.917 27.401,29.917 27.3,29.899 27.274,29.817 27.298,29.693 27.298,29.433 27.374,29.207 27.546,28.94 27.611,28.84 27.644,28.797 27.675,28.792 z M 19.042,28.811 C 19.111,28.811 19.319,28.961 19.396,29.065 19.482,29.175 19.58,29.83 19.525,29.943 19.462,30.085 19.154,30.014 19.069,29.837 19.017,29.731 18.894,29.159 18.894,29.023 18.894,28.897 18.955,28.811 19.042,28.811 z M 26.933,28.984 C 27.017,29.104 27.039,29.258 27.021,29.596 L 27.004,29.904 26.916,29.992 C 26.863,30.041 26.773,30.101 26.719,30.126 26.6,30.182 26.509,30.187 26.492,30.142 26.472,30.082 26.506,29.7 26.543,29.571 26.586,29.438 26.779,29.041 26.843,28.957 26.872,28.88 26.906,28.976 26.933,28.984 z M 21.912,28.966 C 22.093,29.012 22.173,29.175 22.272,29.323 L 22.339,29.455 22.245,29.782 C 22.195,29.962 22.142,30.124 22.126,30.142 22.108,30.162 22.041,30.172 21.942,30.171 21.678,30.164 21.648,30.153 21.577,30.045 L 21.511,29.947 21.567,29.672 C 21.648,29.276 21.687,29.157 21.777,29.055 21.824,29 21.871,28.97 21.912,28.966 z M 20.241,29.249 20.39,29.398 20.415,29.735 C 20.428,29.919 20.434,30.09 20.424,30.111 20.415,30.14 20.361,30.148 20.194,30.148 L 19.977,30.148 C 19.861,30.021 19.825,29.866 19.776,29.706 19.662,29.225 19.662,29.006 19.78,28.977 19.973,28.989 20.1,29.129 20.241,29.249 z M 26.041,29.018 C 26.277,29.081 26.23,29.456 26.229,29.724 26.211,30.158 26.194,30.248 26.138,30.304 26.041,30.401 25.771,30.347 25.64,30.203 25.597,30.151 25.593,30.135 25.627,29.924 25.666,29.667 25.716,29.507 25.827,29.287 25.908,29.129 25.984,29.03 26.041,29.018 z M 20.715,29.038 C 20.728,29.037 20.749,29.038 20.769,29.04 20.919,29.052 21.059,29.15 21.183,29.33 L 21.283,29.477 C 21.292,29.718 21.283,29.972 21.24,30.196 21.214,30.209 21.106,30.229 21,30.239 20.816,30.256 20.799,30.252 20.735,30.196 20.646,30.12 20.621,29.979 20.599,29.511 20.586,29.129 20.595,29.044 20.715,29.038 z M 22.984,29.118 C 23.145,29.152 23.247,29.238 23.292,29.379 23.328,29.5 23.35,30.177 23.315,30.224 23.303,30.244 23.227,30.269 23.14,30.28 22.816,30.321 22.53,30.29 22.502,30.213 22.466,30.125 22.707,29.253 22.796,29.145 22.834,29.061 22.926,29.126 22.984,29.118 z M 25.082,29.124 C 25.153,29.117 25.229,29.185 25.303,29.33 25.363,29.451 25.372,29.493 25.372,29.764 25.372,29.98 25.359,30.073 25.336,30.093 25.316,30.109 25.235,30.138 25.149,30.16 24.999,30.199 24.966,30.203 24.919,30.187 L 24.694,30.146 24.711,30.012 C 24.727,29.837 24.842,29.449 24.923,29.281 24.971,29.181 25.026,29.131 25.082,29.124 z M 24.104,29.127 C 24.151,29.125 24.173,29.136 24.203,29.169 24.274,29.253 24.364,29.501 24.421,29.766 24.497,30.139 24.497,30.138 24.334,30.187 24.263,30.209 24.113,30.232 24.006,30.238 23.653,30.256 23.626,30.235 23.669,29.923 23.703,29.645 23.84,29.207 23.899,29.175 23.963,29.141 24.037,29.142 24.104,29.127 z M 6.111,30.536 C 6.114,30.535 6.118,30.536 6.118,30.536 6.127,30.731 6.127,30.928 6.131,31.124 5.636,31.086 5.272,30.968 5.272,30.829 5.272,30.692 5.623,30.575 6.111,30.536 z M 6.976,30.553 C 7.377,30.603 7.654,30.708 7.649,30.829 7.649,30.951 7.381,31.055 6.983,31.104 6.979,30.921 6.979,30.737 6.976,30.553 z M 25.702,31.086 C 25.736,31.083 25.751,31.08 25.803,31.085 26.011,31.106 26.041,31.119 26.041,31.189 26.041,31.281 25.883,31.558 25.776,31.654 25.726,31.702 25.657,31.742 25.633,31.742 25.513,31.742 25.443,31.489 25.499,31.256 25.533,31.13 25.595,31.091 25.702,31.086 z M 24.947,31.169 C 25.04,31.161 25.13,31.186 25.22,31.198 25.194,31.461 25.076,31.676 24.857,31.819 24.803,31.819 24.776,31.716 24.776,31.491 24.776,31.223 24.79,31.172 24.947,31.169 z M 24.119,31.266 C 24.312,31.266 24.482,31.275 24.49,31.286 24.526,31.32 24.422,31.578 24.269,31.84 24.138,32.073 24.119,32.09 24.038,32.096 23.72,32.06 23.729,31.687 23.68,31.431 23.68,31.279 23.714,31.266 24.119,31.266 z M 21.11,31.295 C 21.331,31.299 21.417,31.332 21.417,31.417 21.417,31.525 21.335,31.74 21.288,31.767 21.217,31.806 21.211,31.804 21.071,31.658 20.85,31.41 20.825,31.364 21.11,31.295 z M 22.174,31.306 C 22.178,31.312 22.221,31.39 22.264,31.478 22.358,31.661 22.365,31.741 22.298,31.802 22.14,31.892 22.107,31.841 21.964,31.75 21.798,31.593 21.667,31.382 21.71,31.338 21.858,31.285 22.021,31.305 22.174,31.306 z M 22.596,31.311 22.991,31.318 C 23.145,31.318 23.278,31.326 23.285,31.338 23.312,31.362 23.225,31.876 23.178,31.992 23.124,32.122 22.935,32.123 22.837,31.969 22.697,31.748 22.605,31.562 22.602,31.434 L 22.596,31.311 z" /></g>`,
+  },
+]
diff --git a/plugins/plugin-annotations/src/notches.mjs b/plugins/plugin-annotations/src/notches.mjs
index f04f5c94317..eccb5ed6fb7 100644
--- a/plugins/plugin-annotations/src/notches.mjs
+++ b/plugins/plugin-annotations/src/notches.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export hooks
+export const notchesDefs = [
   {
     name: 'notch',
     def: `
@@ -16,14 +17,3 @@ const defs = [
 </g>`,
   },
 ]
-
-// Export hooks
-export const notchesHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
diff --git a/plugins/plugin-annotations/src/pleat.mjs b/plugins/plugin-annotations/src/pleat.mjs
index 3fe463455f0..3bc0f59c9ac 100644
--- a/plugins/plugin-annotations/src/pleat.mjs
+++ b/plugins/plugin-annotations/src/pleat.mjs
@@ -1,17 +1,14 @@
-const markers = `
+// Export defs
+export const pleatDefs = [
+  {
+    name: 'notch',
+    def: `
 <marker id="pleatTo" markerWidth="12" markerHeight="8" orient="auto" refY="4" refX="12">
   <path class="note fill-note" d="M 12,4 L 0,0 C 2,2 2,6  0,8 z" />
 </marker>
-`
-
-// Export hooks
-export const pleatHooks = {
-  preRender: [
-    function (svg) {
-      svg.defs.setIfUnset('pleatTo', markers)
-    },
-  ],
-}
+`,
+  },
+]
 
 // Export macros
 export const pleatMacros = {
diff --git a/plugins/plugin-annotations/src/sewtogether.mjs b/plugins/plugin-annotations/src/sewtogether.mjs
index d17c5cebd44..6884865e6a7 100644
--- a/plugins/plugin-annotations/src/sewtogether.mjs
+++ b/plugins/plugin-annotations/src/sewtogether.mjs
@@ -1,4 +1,5 @@
-const defs = [
+// Export defs
+export const sewtogetherDefs = [
   {
     name: 'sewTogetherStart',
     def: `
@@ -22,17 +23,6 @@ const defs = [
   },
 ]
 
-// Export hooks
-export const sewtogetherHooks = {
-  preRender: [
-    function (svg) {
-      for (const def of defs) {
-        svg.defs.setIfUnset(def.name, def.def)
-      }
-    },
-  ],
-}
-
 // Export macros
 export const sewtogetherMacros = {
   sewTogether: function (so, { points, paths, Path, complete, sa }) {
diff --git a/plugins/plugin-annotations/tests/buttons.test.mjs b/plugins/plugin-annotations/tests/buttons.test.mjs
index 749142c7501..3539cc90058 100644
--- a/plugins/plugin-annotations/tests/buttons.test.mjs
+++ b/plugins/plugin-annotations/tests/buttons.test.mjs
@@ -11,7 +11,7 @@ pattern.draft().render()
 describe('Buttons Plugin Test', () => {
   for (const snippet of ['button', 'buttonhole', 'snap-stud', 'snap-socket']) {
     it(`Should add the ${snippet} snippet to defs`, () => {
-      expect(pattern.svg.defs.render().indexOf(`<g id="${snippet}">`)).to.not.equal(-1)
+      expect(pattern.svg.defs.get(snippet)).to.not.equal(false)
     })
   }
 
diff --git a/plugins/plugin-annotations/tests/logo.test.mjs b/plugins/plugin-annotations/tests/logo.test.mjs
index 9f6ca4102b8..3e0c6bc5c09 100644
--- a/plugins/plugin-annotations/tests/logo.test.mjs
+++ b/plugins/plugin-annotations/tests/logo.test.mjs
@@ -9,8 +9,6 @@ describe('Logo Plugin Tests', () => {
     const Pattern = new Design()
     const pattern = new Pattern().use(annotationsPlugin)
     pattern.draft().render()
-    expect(pattern.svg.defs.render()).to.contain(
-      '<g id="logo" transform="scale(1) translate(-23 -36)"><path class="logo"'
-    )
+    expect(pattern.svg.defs.get('logo')).to.not.equal(false)
   })
 })
diff --git a/plugins/plugin-annotations/tests/notches.test.mjs b/plugins/plugin-annotations/tests/notches.test.mjs
index a7eb221e982..0427f181427 100644
--- a/plugins/plugin-annotations/tests/notches.test.mjs
+++ b/plugins/plugin-annotations/tests/notches.test.mjs
@@ -16,14 +16,12 @@ const pattern = new Pattern()
 pattern.draft().render()
 
 describe('Notches Plugin Test', () => {
-  it(`Should add the snippets to defs`, () => {
-    expect(pattern.svg.defs.render()).to.contain('<g id="notch">')
+  it(`Should add the bnotch to defs`, () => {
+    expect(pattern.svg.defs.get('bnotch')).to.not.equal(false)
   })
-
-  it(`Should add the notches snippet to defs`, () => {
-    expect(pattern.svg.defs.render().indexOf(`<g id="notch">`)).to.not.equal(-1)
+  it(`Should add the notch to defs`, () => {
+    expect(pattern.svg.defs.get('notch')).to.not.equal(false)
   })
-
   it('Draws a notch on an anchor point', () => {
     const part = {
       name: 'test',

From 9fe51a5b779546730af3b8d52006ed63a03975a6 Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Fri, 21 Apr 2023 04:03:39 +0000
Subject: [PATCH 10/11] forgot plugin-theme

---
 plugins/plugin-theme/src/index.mjs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/plugin-theme/src/index.mjs b/plugins/plugin-theme/src/index.mjs
index 0456c45a52d..dd7940ed568 100644
--- a/plugins/plugin-theme/src/index.mjs
+++ b/plugins/plugin-theme/src/index.mjs
@@ -37,8 +37,8 @@ export const plugin = {
         }
         if (paperless) {
           svg.pattern.settings[0].units === 'imperial'
-            ? (svg.defs += grid.imperial)
-            : (svg.defs += grid.metric)
+            ? svg.defs.setIfUnset('grid', grid.imperial)
+            : svg.defs.setIfUnset('grid', grid.metric)
           const parts = svg.pattern.parts[svg.pattern.activeSet]
           const skipGrid = data.skipGrid || []
           for (const key in parts) {
@@ -48,9 +48,10 @@ export const plugin = {
               let anchor = new Point(0, 0)
               if (typeof points.gridAnchor !== 'undefined') anchor = part.points.gridAnchor
               else if (typeof points.anchor !== 'undefined') anchor = part.points.anchor
-              svg.defs += `<pattern id="grid_${key}" `
-              svg.defs += `xlink:href="#grid" x="${anchor.x}" y="${anchor.y}">`
-              svg.defs += '</pattern>'
+              svg.defs.setIfUnset(
+                'grid_' + key,
+                `<pattern id="grid_${key}" xlink:href="#grid" x="${anchor.x}" y="${anchor.y}"></pattern>'`
+              )
               paths[getId()] = new Path()
                 .move(part.topLeft)
                 .line(new Point(part.topLeft.x, part.bottomRight.y))

From e7ce50976251e1b78da7a6ce9f2c361b53e3eb9b Mon Sep 17 00:00:00 2001
From: Wouter van Wageningen <wouter.vdub@yahoo.com>
Date: Fri, 21 Apr 2023 13:48:18 +0000
Subject: [PATCH 11/11] Added test for `clone()`

---
 packages/core/tests/defs.test.mjs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/tests/defs.test.mjs b/packages/core/tests/defs.test.mjs
index 4ea0bb22d0d..f603c600f80 100644
--- a/packages/core/tests/defs.test.mjs
+++ b/packages/core/tests/defs.test.mjs
@@ -31,4 +31,8 @@ describe('Defs', () => {
     console.log(defs.render())
     expect(defs.render()).to.equal(' test="passed"')
   })
+
+  it('Should be able to clone itself', () => {
+    expect(defs.clone().get('test')).to.equal('passed')
+  })
 })