From 634b4fe7b8fb1d7a75febcf8684b89ee6980ac99 Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Sun, 24 Jul 2022 21:41:41 +0200
Subject: [PATCH] fix(simon): Handle boxpleat issue in yoke. Fixes #2400

---
 CHANGELOG.md              | 6 ++++++
 config/changelog.yaml     | 3 +++
 designs/simon/src/back.js | 1 +
 designs/simon/src/yoke.js | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6762dfe2dae..52896672bae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,12 @@
 
  - Fix hem allowance. Closes [#2350](https://github.com/freesewing/freesewing/issues/2350)
 
+### simon
+
+#### Fixed
+
+ - Fix issue with boxPleat and yoke Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400)
+
 ### simone
 
 #### Fixed
diff --git a/config/changelog.yaml b/config/changelog.yaml
index f2d7b99b187..88a79d0e0f7 100644
--- a/config/changelog.yaml
+++ b/config/changelog.yaml
@@ -20,6 +20,9 @@ Unreleased:
     brian:
       - Make s3 options sticky to zero below 10% to avoid path split issues.
         Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249)
+    simon:
+      - Fix issue with boxPleat and yoke
+        Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400)
     simone:
       - Don't do a negative FBA from there's no need for an FBA
         Fixes [#2121](https://github.com/freesewing/freesewing/issues/2121)
diff --git a/designs/simon/src/back.js b/designs/simon/src/back.js
index 3f0630800bd..674b27c5fb2 100644
--- a/designs/simon/src/back.js
+++ b/designs/simon/src/back.js
@@ -129,6 +129,7 @@ export default (part) => {
   } else points.cbTop = points.cbYoke
 
   // Box pleat
+  points.armholeYokeSplitPreBoxpleat = points.armholeYokeSplit.clone()
   if (options.boxPleat) {
     points.boxPleatLeft = points.cbTop.shift(0, store.get('boxPleatWidth') / 2)
     points.boxPleatMid = points.boxPleatLeft.shift(0, store.get('boxPleatFold'))
diff --git a/designs/simon/src/yoke.js b/designs/simon/src/yoke.js
index f543ef71818..0b7e4064776 100644
--- a/designs/simon/src/yoke.js
+++ b/designs/simon/src/yoke.js
@@ -7,7 +7,7 @@ export default (part) => {
   }
 
   // Paths
-  paths.saBase = new Path().move(points.cbYoke).line(points.armholeYokeSplit)
+  paths.saBase = new Path().move(points.cbYoke).line(points.armholeYokeSplitPreBoxpleat)
   if (options.yokeHeight > 0) paths.saBase = paths.saBase.join(paths.backArmholeYoke)
   paths.saBase = paths.saBase.line(points.s3CollarSplit).join(paths.backCollar)
   if (options.splitYoke) paths.saBase = paths.saBase.line(points.cbYoke).close()