Merge pull request #5916 from BenJamesBen/jaeger-3820

fix(jaeger): Fix undercollar to correct shape

designs/jaeger/src/undercollar.mjs

@@ -1,4 +1,4 @@
-import { collarStand } from './collarstand.mjs'
+import { collar } from './collar.mjs'
 
 /*
  * This collar would benefit from a redesign
@@ -12,94 +12,108 @@ function jaegerUnderCollar({ sa, snippets, points, macro, store, paths, Path, pa
   for (let i of Object.keys(paths)) delete paths[i]
   for (let i of Object.keys(snippets)) delete snippets[i]
 
+  // Paths
   paths.seam = new Path()
-    .move(points.collarCbTop)
+    .move(points.collarCorner)
-    .curve_(points.collarCbTopCp, points.notchTip)
+    ._curve(points.neck, points.collarstandCbBottom)
+    .curve_(points.leftNeck, points.leftCollarCorner)
+    .line(points.notchLeft)
+    .line(points.notchTipRollLeft)
+    ._curve(points.collarCbTopCpRollLeft, points.collarCbTopRoll)
+    .curve_(points.collarCbTopCpRoll, points.notchTipRoll)
     .line(points.notch)
-    .line(points.collarstandTip)
+    .line(points.collarCorner)
-    ._curve(points.collarstandCbTopCp, points.collarstandCbTop)
-    .line(points.collarCbTop)
     .close()
     .attr('class', 'various')
 
   if (sa) {
-    paths.sa1 = new Path().move(points.collarstandCbTop).line(points.collarCbTop).offset(sa)
+    paths.partialSa1 = new Path()
-    paths.sa2 = new Path()
+      .move(points.leftCollarCorner)
-      .move(points.collarstandTip)
+      .line(points.notchLeft)
+      .line(points.notchTipRollLeft)
+      .offset(sa)
+      .hide()
+    paths.partialSa2 = new Path()
+      .move(points.notchTipRoll)
       .line(points.notch)
-      .line(points.notchTip)
+      .line(points.collarCorner)
-      .offset(-1 * sa)
+      .offset(sa)
-    paths.sa = new Path()
+      .hide()
-      .move(points.collarstandTip)
+    paths.sa1 = new Path()
-      .line(paths.sa2.start())
+      .move(points.leftCollarCorner)
-      .join(paths.sa2)
+      .join(paths.partialSa1)
-      .line(points.notchTip)
+      .line(points.notchTipRollLeft)
-      .move(points.collarstandCbTop)
+      .attr('class', 'various sa')
-      .line(paths.sa1.start())
+    paths.sa2 = new Path()
-      .line(paths.sa1.end())
+      .move(points.notchTipRoll)
-      .line(points.collarCbTop)
+      .join(paths.partialSa2)
+      .line(points.collarCorner)
       .attr('class', 'various sa')
-    paths.sa1.hide()
-    paths.sa2.hide()
   }
 
   /*
    * Annotations
    */
   // Cutlist
-  store.cutlist.setCut({ cut: 2, from: 'special' })
+  store.cutlist.setCut([
+    { cut: 1, from: 'special' },
+    { cut: 1, from: 'canvas' },
+  ])
 
   // Title
-  points.title = points.collarCbTopCp.shiftFractionTowards(points.collarstandCbTopCp, 0.5)
+  points.title = points.collarCbTopCp
+    .shiftFractionTowards(points.collarstandCbTopCp, 0.4)
+    .shiftFractionTowards(points.collarstandCbTop, 0.5)
   macro('rmtitle')
   macro('title', {
     at: points.title,
     nr: 6,
-    title: 'underCollar',
+    title: 'undercollar',
+    scale: 0.6,
   })
 
   // Dimensions
   macro('rmad')
   macro('hd', {
     id: 'wAtTop',
-    from: points.collarstandCbTop,
+    from: points.leftCollarCorner,
-    to: points.collarstandTip,
+    to: points.collarCorner,
-    y: points.collarstandCbTop.y - 15,
+    y: points.collarstandCbBottom.y - 10,
   })
   macro('hd', {
     id: 'wFull',
-    from: points.collarstandCbTop,
+    from: points.notchLeft,
     to: points.notch,
-    y: points.collarstandCbTop.y - 30,
+    y: points.collarstandCbBottom.y - 25,
   })
   macro('hd', {
     id: 'wAtBottom',
-    from: points.collarCbTop,
+    from: points.notchTipRollLeft,
-    to: points.notchTip,
+    to: points.notchTipRoll,
-    y: points.notchTip.y + 15,
+    y: points.notchTipRoll.y + 15,
   })
   macro('vd', {
     id: 'hAtCb',
-    to: points.collarstandCbTop,
+    to: points.collarstandCbBottom,
-    from: points.collarCbTop,
+    from: points.collarCbTopRoll,
     x: points.collarCbTop.x - sa - 15,
   })
   macro('ld', {
     id: 'lTopSide',
-    to: points.collarstandTip,
+    to: points.collarCorner,
     from: points.notch,
     d: -1 * sa - 15,
   })
   macro('ld', {
     id: 'lBottomSide',
-    from: points.notchTip,
+    from: points.notchTipRoll,
     to: points.notch,
     d: -15 - sa,
   })
   macro('vd', {
     id: 'hFull',
-    from: points.notchTip,
+    from: points.notchTipRoll,
-    to: points.collarstandCbTop,
+    to: points.collarstandCbBottom,
     x: points.notch.x + sa + 40,
   })
 
@@ -108,6 +122,6 @@ function jaegerUnderCollar({ sa, snippets, points, macro, store, paths, Path, pa
 
 export const underCollar = {
   name: 'jaeger.underCollar',
-  from: collarStand,
+  from: collar,
   draft: jaegerUnderCollar,
 }

markdown/org/docs/designs/jaeger/cutting/en.md

@@ -9,7 +9,7 @@ title: "Jaeger jacket: Cutting Instructions"
   - Cut **2 sides** (part 3)
   - Cut **2 topsleeves** (part 4)
   - Cut **2 undersleeves** (part 5)
-  - Cut **1 collar** (part 6)
+  - Cut **1 collar** (part 7)
   - Cut **1 collarstand** (part 8)
   - Cut **2 pockets** (part 9)
   - Cut **1 chest pocket welt** (part 10)
@@ -26,8 +26,9 @@ title: "Jaeger jacket: Cutting Instructions"
 - **Canvas**
   - Cut **2 fronts** on bias (part 1) Note: Don't include seam allowance
   - Cut **2 chest pieces** on bias. Look for the indication on the front part. Note: Don't include seam allowance
+  - Cut **1 undercollar** (part 6). Do not include seam allowance.
 - **Undercollar fabric**
-  - Cut **2 undercollars** (part 7)
+  - Cut **1 undercollar** (part 6)
 
 <Note>
 

markdown/org/docs/designs/jaeger/instructions/en.md

@@ -245,12 +245,16 @@ So make sure to align the notches. It's what they're there for.
 In order to look real crisp, the collar should be symmetrical on both sides. 
 About 5mm difference is already visible to a collar, so the more precise you do these steps, the better.
 
-### Add markings to both collars
+### Add markings to both collar and undercollar
-But both collars on top of each other, baste the corners together and cut the basting.
+Put the collar and undercollar on top of each other, baste the corners together and cut the basting.
 Then use a marking pencil or some chalk to mark the edges of the collar. 
 Measure 2 times to make sure the remaining collars and the location of the corners are 100% identical on both corners
 ![Mark the collar Edges](collarMarkings.svg)
 
+<Note compact>
+The undercollar's shape is that of the collar and collarstand parts
+combined.
+</Note>
 
 #### Add interfacing or canvas to the outside collar stand and under collar
 Either use a fusible interfacing, or, if you want to be hardcore use a horsehair canvas. 
@@ -269,7 +273,7 @@ Cut the seam allowance in the corners diagonally for a better fit
 ### Sleeves
 Sew the uppersleeve to the undersleeve until the split
 
-#### Create the split at the eng of the sleeve
+#### Create the split at the end of the sleeve
 
 Sew the other side of the sleeves
 Turn the sleeves with the good side out