feat(simon): Ported Brian's s3 options

packages/simon/src/back.js

@@ -26,10 +26,9 @@ export default (part) => {
       .move(points.armhole)
       .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
       .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
-      .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
+      .join(paths.backArmhole)
       .length()
   )
-
   // Hip shaping
   points.hips = points.hips.shift(180, store.get('hipsReduction') / 4)
   points.hem = points.hem.shift(180, store.get('hipsReduction') / 4)

packages/simon/src/front.js

@@ -1,7 +1,6 @@
 import { calculateReduction } from './shared'
 
 export default (part) => {
-  part.paths = {}
   let {
     store,
     measurements,
@@ -12,9 +11,18 @@ export default (part) => {
     paths,
     complete,
     macro,
+    snippets,
     options,
   } = part.shorthand()
 
+  // Clean up
+  for (let i in paths) {
+    if (['frontArmhole', 'frontCollar'].indexOf(i) === -1) delete paths[i]
+  }
+  for (let i in snippets) {
+    if (i.indexOf('otch')) delete snippets[i]
+  }
+
   // Populare store with data we need
   calculateReduction(part)
   store.set(
@@ -23,7 +31,7 @@ export default (part) => {
       .move(points.armhole)
       .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
       .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
-      .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
+      .join(paths.frontArmhole)
       .length()
   )
 
@@ -56,9 +64,9 @@ export default (part) => {
     .move(points.armhole)
     .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
     .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
-    .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
+    .join(paths.frontArmhole)
-    .line(points.neck)
+    .line(points.s3CollarSplit)
-    .curve(points.neckCp2Front, points.cfNeckCp1, points.cfNeck)
+    .join(paths.frontCollar)
   switch (options.hemStyle) {
     case 'baseball':
       points.bballStart = points.cfHem.shiftFractionTowards(points.hem, 0.5)

packages/simon/src/frontleft-classic-cuton.js

@@ -145,12 +145,12 @@ export default (part) => {
     }
     macro('hd', {
       from: points.placketTopEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
       y: points.placketTopEdge.y - offset - sa - 15,
     })
     macro('hd', {
       from: points.placketTopEdge,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
       y: points.placketTopEdge.y - offset - sa - 30,
     })
     macro('hd', {

packages/simon/src/frontleft-classic-seperate.js

@@ -57,27 +57,27 @@ export default (part) => {
   if (paperless) {
     macro('hd', {
       from: points.neckEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
-      y: points.neck.y - sa - 15,
+      y: points.s3CollarSplit.y - sa - 15,
     })
     macro('hd', {
       from: points.neckEdge,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
-      y: points.neck.y - sa - 30,
+      y: points.s3CollarSplit.y - sa - 30,
     })
     macro('hd', {
       from: points.neckEdge,
       to: points.armhole,
-      y: points.neck.y - sa - 45,
+      y: points.s3CollarSplit.y - sa - 45,
     })
     macro('vd', {
       from: points.neckEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
       x: points.neckEdge.x - sa - 15,
     })
     macro('vd', {
       from: points.hemEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
       x: points.neckEdge.x - sa - 30,
     })
     for (let pid of ['Armhole', 'Waist', 'Hips']) {

packages/simon/src/frontleft-seamless.js

@@ -68,18 +68,18 @@ export default (part) => {
     }
     macro('hd', {
       from: points.placketTopEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
-      y: points.neck.y - 15 - sa,
+      y: points.s3CollarSplit.y - 15 - sa,
     })
     macro('hd', {
       from: points.placketTopEdge,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
-      y: points.neck.y - 30 - sa,
+      y: points.s3CollarSplit.y - 30 - sa,
     })
     macro('hd', {
       from: points.placketTopEdge,
       to: points.armhole,
-      y: points.neck.y - 45 - sa,
+      y: points.s3CollarSplit.y - 45 - sa,
     })
     points.button0 = points.placketTopEdge
     let j

packages/simon/src/frontleft.js

@@ -9,8 +9,8 @@ export default (part) => {
   if (complete && paperless) {
     frontDimensions(part, 'left')
     macro('ld', {
-      from: points.neck,
+      from: points.s3CollarSplit,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
       d: 15 + sa,
     })
   }

packages/simon/src/frontright-classic-cuton.js

@@ -89,19 +89,19 @@ export default (part) => {
       y: points.placketTopEdge.y - 45 - sa,
     })
     macro('hd', {
-      from: points.neck,
+      from: points.s3CollarSplit,
       to: points.placketTopEdge,
-      y: points.neck.y - 15 - sa,
+      y: points.s3CollarSplit.y - 15 - sa,
     })
     macro('hd', {
-      from: points.shoulder,
+      from: points.s3ArmholeSplit,
       to: points.placketTopEdge,
-      y: points.neck.y - 30 - sa,
+      y: points.s3CollarSplit.y - 30 - sa,
     })
     macro('hd', {
       from: points.armhole,
       to: points.placketTopEdge,
-      y: points.neck.y - 45 - sa,
+      y: points.s3CollarSplit.y - 45 - sa,
     })
     points.button0 = points.placketTopEdge
     let j

packages/simon/src/frontright-classic-seperate.js

@@ -43,23 +43,23 @@ export default (part) => {
   // Paperless?
   if (paperless) {
     macro('hd', {
-      from: points.neck,
+      from: points.s3CollarSplit,
       to: points.placketTopIn,
-      y: points.neck.y - sa - 15,
+      y: points.s3CollarSplit.y - sa - 15,
     })
     macro('hd', {
-      from: points.shoulder,
+      from: points.s3ArmholeSplit,
       to: points.placketTopIn,
-      y: points.neck.y - sa - 30,
+      y: points.s3CollarSplit.y - sa - 30,
     })
     macro('hd', {
       from: points.armhole,
       to: points.placketTopIn,
-      y: points.neck.y - sa - 45,
+      y: points.s3CollarSplit.y - sa - 45,
     })
     macro('vd', {
       from: points.placketTopIn,
-      to: points.neck,
+      to: points.s3CollarSplit,
       x: points.placketTopIn.x + sa + 15,
     })
     macro('vd', {

packages/simon/src/frontright-seamless.js

@@ -68,7 +68,7 @@ export default (part) => {
       y: points.hps.y - sa - 15,
     })
     macro('hd', {
-      from: points.shoulder,
+      from: points.s3ArmholeSplit,
       to: points.placketTopEdge,
       y: points.hps.y - sa - 30,
     })
@@ -79,7 +79,7 @@ export default (part) => {
     })
     macro('vd', {
       from: points.placketTopEdge,
-      to: points.neck,
+      to: points.s3CollarSplit,
       x: points.placketTopEdge.x + sa + 15,
     })
     macro('vd', {

packages/simon/src/frontright.js

@@ -12,8 +12,8 @@ export default (part) => {
     if (paperless) {
       frontDimensions(part, 'right')
       macro('ld', {
-        from: points.shoulder,
+        from: points.s3ArmholeSplit,
-        to: points.neck,
+        to: points.s3CollarSplit,
         d: 15 + sa,
       })
       if (sa) {

packages/simon/src/shared.js

@@ -213,12 +213,6 @@ export const frontDimensions = (part, side = 'left') => {
     text: ['frenchSeam', ': 2x', 'seamAllowance'],
   })
   if (paperless) {
-    macro('pd', {
-      path: new Path()
-        .move(points.armholePitch)
-        .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder),
-      d: -15 * factor,
-    })
     macro('vd', {
       from: points.armhole,
       to: points.armholePitch,
@@ -226,12 +220,12 @@ export const frontDimensions = (part, side = 'left') => {
     })
     macro('vd', {
       from: points.armhole,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
       x: points.armhole.x + (30 + sa * 2) * factor,
     })
     macro('vd', {
       from: points.armhole,
-      to: points.neck,
+      to: points.s3CollarSplit,
       x: points.armhole.x + (45 + sa * 2) * factor,
     })
     macro('vd', {
@@ -266,7 +260,7 @@ export const frontDimensions = (part, side = 'left') => {
       })
       macro('vd', {
         from: points.bballStart,
-        to: points.neck,
+        to: points.s3CollarSplit,
         x: points.hips.x + (60 + 2 * sa) * factor,
       })
       macro('hd', {
@@ -292,7 +286,7 @@ export const frontDimensions = (part, side = 'left') => {
       })
       macro('vd', {
         from: points.slashEnd,
-        to: points.neck,
+        to: points.s3CollarSplit,
         x: points.hips.x + (60 + 3 * sa) * factor,
       })
     } else {
@@ -303,7 +297,7 @@ export const frontDimensions = (part, side = 'left') => {
       })
       macro('vd', {
         from: points.hem,
-        to: points.neck,
+        to: points.s3CollarSplit,
         x: points.armhole.x + (60 + 2 * sa) * factor,
       })
     }

packages/simon/src/yoke.js

@@ -44,6 +44,8 @@ export default (part) => {
   // Complete pattern?
   if (complete) {
     delete snippets.armholePitchNotch
+    delete snippets.collarNotch
+    delete snippets.shoulderNotch
     points.title = new Point(points.neck.x, points.cbYoke.y / 3)
     macro('title', { at: points.title, nr: 4, title: 'yoke', scale: 0.8 })
     points.logo = points.title.shift(-90, 50)
@@ -75,18 +77,14 @@ export default (part) => {
 
   // Paperless?
   if (paperless) {
-    macro('pd', {
-      path: new Path().move(points.cbNeck)._curve(points.neckCp2, points.neck),
-      d: 15,
-    })
     macro('hd', {
       from: points.cbNeck,
-      to: points.neck,
+      to: points.s3CollarSplit,
-      y: points.neck.y - 15 - sa,
+      y: points.s3CollarSplit.y - 15 - sa,
     })
     macro('ld', {
-      from: points.neck,
+      from: points.s3CollarSplit,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
       d: 15 + sa,
     })
     macro('hd', {
@@ -96,7 +94,7 @@ export default (part) => {
     })
     macro('hd', {
       from: points.cbYoke,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
       y: points.cbYoke.y + 30 + sa,
     })
     macro('vd', {
@@ -104,16 +102,10 @@ export default (part) => {
       to: points.cbNeck,
       x: points.cbYoke.x - 15 - sa,
     })
-    macro('pd', {
-      path: new Path()
-        .move(points.armholePitch)
-        .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder),
-      d: 15 + sa,
-    })
     macro('vd', {
       from: points.armholePitch,
-      to: points.shoulder,
+      to: points.s3ArmholeSplit,
-      x: points.shoulder.x + 30 + sa,
+      x: points.s3ArmholeSplit.x + 30 + sa,
     })
   }