sparkles: Paperless yoke

packages/simon/index.html

@@ -112,9 +112,9 @@ let settings1 = { ...settings };
       pattern1.settings.options.cuffButtonRows = 2;
       pattern1.settings.options.barrelCuffNarrowButton = "yes";
       pattern1.settings.options.cuffStyle = "straightBarrelCuff";
-      //pattern1.settings.options.splitYoke = "yes";
+      pattern1.settings.options.splitYoke = "yes";
       pattern1.settings.sa = 10;
-      pattern1.settings.only = "collar";
+      pattern1.settings.only = "yoke";
       pattern1.draft();
       console.log(pattern1);
       document.getElementById("svg1").innerHTML = pattern1.render();

packages/simon/src/back.js

@@ -1,8 +1,22 @@
 import { calculateReduction } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   // Populare store with data we need
   calculateReduction(part);

packages/simon/src/buttonholeplacket.js

@@ -1,8 +1,22 @@
 import { addButtonHoles } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   if (
     options.buttonholePlacketType !== "seperate" ||

packages/simon/src/buttonplacket.js

@@ -1,8 +1,22 @@
 import { addButtons } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   if (
     options.buttonPlacketType !== "seperate" ||

packages/simon/src/collar.js

@@ -1,6 +1,20 @@
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   const draft = function(tweak = 1) {
     let length =

packages/simon/src/cuff-barrel-angled.js

@@ -5,8 +5,22 @@ import {
 } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   draftBarrelCuff(part);
   let height = store.get("cuffHeight");

packages/simon/src/front.js

@@ -1,8 +1,22 @@
 import { calculateReduction } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   // Populare store with data we need
   calculateReduction(part);

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

@@ -1,8 +1,22 @@
 import { addButtonHoles } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   let fold = options.buttonholePlacketFoldWidth;
   let width = options.buttonholePlacketWidth;

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

@@ -1,8 +1,22 @@
 import { addButtonHoles } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   let fold = options.buttonholePlacketFoldWidth;
   points.neckEdge = utils.lineIntersectsCurve(

packages/simon/src/frontleft-seamless.js

@@ -1,8 +1,22 @@
 import { addButtonHoles } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   console.log("seamless buttonjholes");
   let fold = options.buttonholePlacketFoldWidth;

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

@@ -1,8 +1,22 @@
 import { addButtons } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   let width = options.buttonPlacketWidth;
   points.placketTopIn = utils.lineIntersectsCurve(

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

@@ -1,6 +1,20 @@
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   let width = options.buttonPlacketWidth;
   points.placketTopIn = utils.lineIntersectsCurve(

packages/simon/src/frontright-seamless.js

@@ -1,8 +1,22 @@
 import { addButtons } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   let width = options.buttonPlacketWidth;
   points.placketTopFold1 = points.cfNeck.shift(0, width / 2);

packages/simon/src/sleeve.js

@@ -1,8 +1,22 @@
 import { calculateReduction } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   // TODO: Sleeve pleats
 

packages/simon/src/yoke.js

@@ -1,8 +1,22 @@
 import { calculateReduction } from "./shared";
 
 export default part => {
-  // prettier-ignore
-  let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
+  let {
+    store,
+    measurements,
+    utils,
+    sa,
+    Point,
+    points,
+    Path,
+    paths,
+    Snippet,
+    snippets,
+    complete,
+    paperless,
+    macro,
+    options
+  } = part.shorthand();
 
   for (let id of Object.keys(part.paths)) delete part.paths[id];
 
@@ -63,6 +77,46 @@ 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,
+      y: points.neck.y - 15 - sa
+    });
+    macro("ld", {
+      from: points.neck,
+      to: points.shoulder,
+      d: 15 + sa
+    });
+    macro("hd", {
+      from: points.cbYoke,
+      to: points.armholePitch,
+      y: points.cbYoke.y + 15 + sa
+    });
+    macro("hd", {
+      from: points.cbYoke,
+      to: points.shoulder,
+      y: points.cbYoke.y + 30 + sa
+    });
+    macro("vd", {
+      from: points.cbYoke,
+      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,
+      x: points.shoulder.x + 30 + sa
+    });
   }
 
   return part;