diff --git a/designs/lumina/i18n/en.json b/designs/lumina/i18n/en.json
index 18e6ad9d0ca..60d27a6076b 100644
--- a/designs/lumina/i18n/en.json
+++ b/designs/lumina/i18n/en.json
@@ -4,15 +4,15 @@
"p": {
"shape": "Shape",
"leg": "Leg",
- "panel": "Side Pannel",
+ "panel": "Side panel",
"pocket": "Pocket",
"waistband": "Waistband"
},
"s": {
- "couldNotLowerWaist": "Could not lower the waist",
- "cantFitTheWaistPoint": "Cannot fit the waist point",
- "couldNoFitWaistband": "Could not fit the waistband",
- "couldNotCreatePocket": "Could not create the pocket",
+ "couldNotLowerWaist.t": "Could not lower the waist",
+ "cantFitTheWaistPoint.t": "Cannot fit the waist point",
+ "couldNoFitWaistband.t": "Could not fit the waistband",
+ "couldNotCreatePocket.t": "Could not create the pocket",
"dimensions.d": "Dimensions",
"dimensions.t": "Waistband will be {{{ waistbandlength }}} long total.\nThe length of the garment along the side will be {{{ length }}}."
},
diff --git a/designs/lumina/src/index.mjs b/designs/lumina/src/index.mjs
index e1082e1bb3d..85f68e79c47 100644
--- a/designs/lumina/src/index.mjs
+++ b/designs/lumina/src/index.mjs
@@ -18,11 +18,3 @@ const Lumina = new Design({
// Named exports
export { i18n, Lumina, shape, panel, leg, waistband, pocket }
-
-// const classes = ['lining','canvas','mark','contrast','note','interfacing','various']
-
-// http://localhost:8000/new/lumina#view=%22inspect%22&settings=%7B%22measurements%22%3A%7B%22waist%22%3A960%2C%22waistBack%22%3A440%2C%22hips%22%3A884%2C%22seat%22%3A980%2C%22seatBack%22%3A490%2C%22inseam%22%3A790%2C%22waistToSeat%22%3A230%2C%22waistToUpperLeg%22%3A280%2C%22waistToKnee%22%3A610%2C%22waistToHips%22%3A120%2C%22waistToFloor%22%3A1090%2C%22knee%22%3A415%2C%22ankle%22%3A230%2C%22crossSeam%22%3A800%2C%22crossSeamFront%22%3A380%2C%22heel%22%3A300%2C%22upperLeg%22%3A640%7D%7D
-
-// http://localhost:8000/new/lumina#view=%22inspect%22&settings=%7B%22measurements%22%3A%7B%22waist%22%3A780%2C%22waistBack%22%3A360%2C%22hips%22%3A860%2C%22seat%22%3A980%2C%22seatBack%22%3A510%2C%22inseam%22%3A680%2C%22waistToSeat%22%3A200%2C%22waistToUpperLeg%22%3A250%2C%22waistToKnee%22%3A500%2C%22waistToHips%22%3A90%2C%22waistToFloor%22%3A890%2C%22knee%22%3A360%2C%22ankle%22%3A220%2C%22crossSeam%22%3A620%2C%22crossSeamFront%22%3A290%2C%22heel%22%3A280%2C%22upperLeg%22%3A580%7D%2C%22options%22%3A%7B%22length%22%3A1%2C%22waistreduction%22%3A0.1%2C%22waistLowering%22%3A0.012%2C%22waistlowering%22%3A0.181%7D%2C%22units%22%3A%22metric%22%7D
-
-// Climbing pants http://localhost:8000/new/lumina#view=%22draft%22&settings=%7B%22measurements%22%3A%7B%22waist%22%3A780%2C%22waistBack%22%3A360%2C%22hips%22%3A860%2C%22seat%22%3A980%2C%22seatBack%22%3A510%2C%22inseam%22%3A680%2C%22waistToSeat%22%3A200%2C%22waistToUpperLeg%22%3A250%2C%22waistToKnee%22%3A500%2C%22waistToHips%22%3A90%2C%22waistToFloor%22%3A890%2C%22knee%22%3A360%2C%22ankle%22%3A220%2C%22crossSeam%22%3A620%2C%22crossSeamFront%22%3A290%2C%22heel%22%3A280%2C%22upperLeg%22%3A580%7D%2C%22options%22%3A%7B%22waistreduction%22%3A0%2C%22ease%22%3A0.1%2C%22length%22%3A0.945%2C%22waistband%22%3Afalse%2C%22pocket%22%3Afalse%2C%22waistlowering%22%3A0.2%7D%2C%22sabool%22%3A1%2C%22sa%22%3A10%2C%22samm%22%3A10%7D
diff --git a/designs/lumina/src/leg.mjs b/designs/lumina/src/leg.mjs
index 1d5704f5492..69d98f20852 100644
--- a/designs/lumina/src/leg.mjs
+++ b/designs/lumina/src/leg.mjs
@@ -65,16 +65,16 @@ export const leg = {
if (!points.frontSplitWaistband.sitsRoughlyOn(front)) {
macro('hd', {
id: 'middleToFront',
- from: points.middleUpperLeg,
- to: front,
+ from: front,
+ to: points.middleUpperLeg,
y: top.y - sa - 35,
})
}
if (!points.backSplitWaistband.sitsRoughlyOn(back)) {
macro('hd', {
id: 'middleToBack',
- from: back,
- to: points.middleUpperLeg,
+ from: points.middleUpperLeg,
+ to: back,
y: top.y - sa - 35,
})
}
diff --git a/designs/lumina/src/waistband.mjs b/designs/lumina/src/waistband.mjs
index 54d7f63e133..319d9cf2e24 100644
--- a/designs/lumina/src/waistband.mjs
+++ b/designs/lumina/src/waistband.mjs
@@ -37,6 +37,13 @@ export const waistband = {
const radius = (waistLength * 0.5) / Math.sin(angleRad)
const baseAngle = waistLength < waistbandLength ? 270 : 90
let angle = utils.rad2deg(angleRad)
+ if (isNaN(angle)) {
+ log.info('lumina:couldNoFitWaistband')
+ store.flag.note({
+ msg: `lumina:couldNoFitWaistband`,
+ })
+ return part.hide()
+ }
let diff = 0
let iter = 0
@@ -114,10 +121,10 @@ export const waistband = {
.setClass('hidden')
let top = paths.waist.edge('top')
- if (top.y == points.waistFront.y) {
+ if (top.y == points.waistBack.y) {
top = paths.waist.edge('bottom')
}
- let bottom = paths.waistband.edge('bottom')
+ let bottom = paths.waistband.shiftFractionAlong(0.5)
if (bottom.y == points.waistbandFront.y) {
bottom = paths.waistband.edge('top')
}
@@ -167,7 +174,7 @@ export const waistband = {
id: 'bottom',
from: points.waistbandBack,
to: points.waistbandFront,
- y: Math.max(points.waistbandFront.y, bottom.y) + sa + 15,
+ y: Math.max(points.waistbandFront.y, Math.max(bottom.y, points.waistbandBack.y)) + sa + 15,
})
macro('vd', {
id: 'top',
diff --git a/designs/lumira/src/shape.mjs b/designs/lumira/src/shape.mjs
index 15aa0c06812..1693277241b 100644
--- a/designs/lumira/src/shape.mjs
+++ b/designs/lumira/src/shape.mjs
@@ -28,7 +28,7 @@ export const controlPoints = (p1, p2, p3, cpDistanceDivider) => {
return { cp1: p1.clone(), cp2: cp2 }
}
if (p3 !== undefined && p2.sitsRoughlyOn(p3)) {
- return { cp1: cp1.clone(), cp2: p3.clone() }
+ return { cp1: cp1, cp2: p3.clone() }
}
return { cp1: cp1, cp2: cp2 }
}
diff --git a/markdown/org/docs/designs/lumina/fabric/en.md b/markdown/org/docs/designs/lumina/fabric/en.md
index a5d75a18050..e1246c5d5be 100644
--- a/markdown/org/docs/designs/lumina/fabric/en.md
+++ b/markdown/org/docs/designs/lumina/fabric/en.md
@@ -13,15 +13,15 @@ getting a good fit.
If the ease setting is larger than 0 (positive ease), any type of knit fabric can be used. Keep in mind that even with the ease
-set at the maximum, you probably will not be able to use a fabric with no stretch at all (a wovel fabric).
+set at the maximum, you probably will not be able to use a fabric with no stretch at all (a woven fabric).
-These fabrics come in different weights. Pick one that works for how you intent to use it. Thicker fabrics provide more support
+These fabrics come in different weights. Pick one that works for how you intend to use it. Thicker fabrics provide more support
and warmth.
For yoga pants, take something that has a medium thickness. Supplex is a good choice for this. It also works well for cycling. For
-other athletic use fabrics that would be appropriate for that. Most fabrics that contain spandex will work.
+other athletics use fabrics that would be appropriate for that. Most fabrics that contain spandex will work.
diff --git a/markdown/org/docs/designs/lumina/options/de.md b/markdown/org/docs/designs/lumina/options/de.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/de.md
+++ b/markdown/org/docs/designs/lumina/options/de.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+
diff --git a/markdown/org/docs/designs/lumina/options/ease/de.md b/markdown/org/docs/designs/lumina/options/ease/de.md
index 1cf4921212d..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/de.md
+++ b/markdown/org/docs/designs/lumina/options/ease/de.md
@@ -4,16 +4,16 @@ title: "Ease"
***
-Controls the amount of ease build into the pattern. Since these are leggings that are to be made of stretch fabric,
-the ease is nagative. So the completed garment will be narower than the measurements would dictate.
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
-Getting the wease right for your type of fabric is essential for getting a good fit. If you make the ease
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
places, without being too tight.
-With a positive ease, these leggings will tuirn into slightly loose fitting pants
+With a positive ease, these leggings will turn into slightly loose fitting pants
diff --git a/markdown/org/docs/designs/lumina/options/ease/en.md b/markdown/org/docs/designs/lumina/options/ease/en.md
index 8b137891791..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/en.md
+++ b/markdown/org/docs/designs/lumina/options/ease/en.md
@@ -1 +1,19 @@
+---
+title: "Ease"
+---
+***
+
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
+
+
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
+too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
+negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
+places, without being too tight.
+
+
+
+With a positive ease, these leggings will turn into slightly loose fitting pants
+
diff --git a/markdown/org/docs/designs/lumina/options/ease/es.md b/markdown/org/docs/designs/lumina/options/ease/es.md
index 1cf4921212d..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/es.md
+++ b/markdown/org/docs/designs/lumina/options/ease/es.md
@@ -4,16 +4,16 @@ title: "Ease"
***
-Controls the amount of ease build into the pattern. Since these are leggings that are to be made of stretch fabric,
-the ease is nagative. So the completed garment will be narower than the measurements would dictate.
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
-Getting the wease right for your type of fabric is essential for getting a good fit. If you make the ease
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
places, without being too tight.
-With a positive ease, these leggings will tuirn into slightly loose fitting pants
+With a positive ease, these leggings will turn into slightly loose fitting pants
diff --git a/markdown/org/docs/designs/lumina/options/ease/fr.md b/markdown/org/docs/designs/lumina/options/ease/fr.md
index 1cf4921212d..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/fr.md
+++ b/markdown/org/docs/designs/lumina/options/ease/fr.md
@@ -4,16 +4,16 @@ title: "Ease"
***
-Controls the amount of ease build into the pattern. Since these are leggings that are to be made of stretch fabric,
-the ease is nagative. So the completed garment will be narower than the measurements would dictate.
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
-Getting the wease right for your type of fabric is essential for getting a good fit. If you make the ease
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
places, without being too tight.
-With a positive ease, these leggings will tuirn into slightly loose fitting pants
+With a positive ease, these leggings will turn into slightly loose fitting pants
diff --git a/markdown/org/docs/designs/lumina/options/ease/nl.md b/markdown/org/docs/designs/lumina/options/ease/nl.md
index 4ae9e35b387..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/nl.md
+++ b/markdown/org/docs/designs/lumina/options/ease/nl.md
@@ -4,6 +4,16 @@ title: "Ease"
***
-Controls the amount of ease build into the pattern. Since these are leggings that are to be made of stretch fabric,
-the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
+
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
+too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
+negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
+places, without being too tight.
+
+
+
+With a positive ease, these leggings will turn into slightly loose fitting pants
+
diff --git a/markdown/org/docs/designs/lumina/options/ease/uk.md b/markdown/org/docs/designs/lumina/options/ease/uk.md
index 1cf4921212d..46458170021 100644
--- a/markdown/org/docs/designs/lumina/options/ease/uk.md
+++ b/markdown/org/docs/designs/lumina/options/ease/uk.md
@@ -4,16 +4,16 @@ title: "Ease"
***
-Controls the amount of ease build into the pattern. Since these are leggings that are to be made of stretch fabric,
-the ease is nagative. So the completed garment will be narower than the measurements would dictate.
+Controls the amount of ease built into the pattern. Since these are leggings that are to be made of stretch fabric,
+the ease is nagative. So the completed garment will be narrower than the measurements would dictate.
-Getting the wease right for your type of fabric is essential for getting a good fit. If you make the ease
+Getting the ease right for your type of fabric is essential for getting a good fit. If you make the ease
too negative, the leggings will be too constricting, and limiting movement. If you don't make the ease
negative enough, the leggings will not hug your legs and torso. The fabric should be stretched in all
places, without being too tight.
-With a positive ease, these leggings will tuirn into slightly loose fitting pants
+With a positive ease, these leggings will turn into slightly loose fitting pants
diff --git a/markdown/org/docs/designs/lumina/options/en.md b/markdown/org/docs/designs/lumina/options/en.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/en.md
+++ b/markdown/org/docs/designs/lumina/options/en.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+
diff --git a/markdown/org/docs/designs/lumina/options/es.md b/markdown/org/docs/designs/lumina/options/es.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/es.md
+++ b/markdown/org/docs/designs/lumina/options/es.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+
diff --git a/markdown/org/docs/designs/lumina/options/fr.md b/markdown/org/docs/designs/lumina/options/fr.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/fr.md
+++ b/markdown/org/docs/designs/lumina/options/fr.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+
diff --git a/markdown/org/docs/designs/lumina/options/nl.md b/markdown/org/docs/designs/lumina/options/nl.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/nl.md
+++ b/markdown/org/docs/designs/lumina/options/nl.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+
diff --git a/markdown/org/docs/designs/lumina/options/sidepanelsize/en.md b/markdown/org/docs/designs/lumina/options/sidepanelsize/en.md
index 8b137891791..80e25f47b11 100644
--- a/markdown/org/docs/designs/lumina/options/sidepanelsize/en.md
+++ b/markdown/org/docs/designs/lumina/options/sidepanelsize/en.md
@@ -1 +1,11 @@
+---
+title: "Side panel side"
+---
+
+***
+
+Controls the width of the side panel. This is a percentage of the waist.
+
+
+
diff --git a/markdown/org/docs/designs/lumina/options/uk.md b/markdown/org/docs/designs/lumina/options/uk.md
index 28b2581450d..7b6330f3b63 100644
--- a/markdown/org/docs/designs/lumina/options/uk.md
+++ b/markdown/org/docs/designs/lumina/options/uk.md
@@ -1,5 +1,5 @@
---
-title: "Lumira leggings: Design Options"
+title: "Lumina leggings: Design Options"
---
-
+