geometrix 0.5.13 → 0.5.15

package/dist/index.d.ts

@@ -34,15 +34,23 @@ declare function adjustRect(p1x: number, p1y: number, p2x: number, p2y: number,
 declare function adjustScale(iFactor: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
 declare function adjustTranslate(p1x: number, p1y: number, p2x: number, p2y: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
 
+declare const tolerance: number;
 declare function degToRad(degrees: number): number;
 declare function radToDeg(rad: number): number;
 declare function roundZero(ix: number): number;
 declare function withinZero2Pi(ia: number): number;
 declare function withinPiPi(ia: number): number;
+declare function withinZeroPi(ia: number): number;
+declare function withinHPiHPi(ia: number): number;
+declare function orientedArc(aStart: number, aStop: number, ccw: boolean): number;
+declare function isWithin(aNew: number, aStart: number, aStop: number, ccw: boolean): boolean;
 declare function ffix(ifloat: number): string;
 
+declare function rightTriLaFromLbLc(ilb: number, ilc: number): number;
+declare function rightTriLbFromLaLc(ila: number, ilc: number): number;
 declare function lcFromLaLbAc(la: number, lb: number, ac: number): number;
 declare function aCFromLaLbLc(la: number, lb: number, lc: number): number;
+declare function aCFromAaAb(iaA: number, iaB: number): number;
 declare function lbFromLaAaAb(ila: number, iaA: number, iaB: number): number;
 declare function aBFromLaLbAa(ila: number, ilb: number, iaA: number): number;
 
@@ -84,6 +92,7 @@ declare class Point {
     equidistantPoint(p2: Point, dist: number, p3: Point): Point;
 }
 declare function point(ix: number, iy: number, ishape?: ShapePoint): Point;
+declare function pointMinMax(aPoint: Point[]): [number, number, number, number];
 
 interface tAffine {
     quasiVertical: boolean;
@@ -130,6 +139,60 @@ declare function linePP(ip1: Point, ip2: Point): Line;
 declare function bisector(ip1: Point, ip2: Point): Line;
 declare function circleCenter(ip1: Point, ip2: Point, ip3: Point): Point;
 
+declare enum SegEnum {
+    eStroke = 0,
+    eArc = 1,
+    ePointed = 2,
+    eRounded = 3,
+    eWidened = 4,
+    eWideAcc = 5,// Widened Access
+    eStart = 6
+}
+declare function isSeg(iSegEnum: SegEnum): boolean;
+declare function isAddPoint(iSegEnum: SegEnum): boolean;
+declare function isActiveCorner(iSegEnum: SegEnum): boolean;
+declare function isCorner(iSegEnum: SegEnum): boolean;
+declare class Segment1 {
+    sType: SegEnum;
+    px: number;
+    py: number;
+    radius: number;
+    arcLarge: boolean;
+    arcCcw: boolean;
+    constructor(iType: SegEnum, ix: number, iy: number, iRadius: number, iArcLarge?: boolean, iArcCcw?: boolean);
+    clone(): Segment1;
+}
+declare class Segment2 {
+    sType: SegEnum;
+    p1: Point;
+    p2: Point;
+    pc: Point;
+    radius: number;
+    a1: number;
+    a2: number;
+    arcCcw: boolean;
+    constructor(iType: SegEnum, ip1: Point, ip2: Point, ipc: Point, iRadius: number, ia1: number, ia2: number, iArcCcw?: boolean);
+}
+declare class SegDbg {
+    debugPoints: Point[];
+    debugLines: Line[];
+    logMessage: string;
+    constructor();
+    addPoint(ip: Point): void;
+    getPoints(): Point[];
+    clearPoints(): void;
+    addLine(il: Line): void;
+    getLines(): Line[];
+    clearLines(): void;
+    addMsg(iMsg: string): void;
+    getMsg(): string;
+    clearMsg(): void;
+}
+declare const gSegDbg: SegDbg;
+declare function arcSeg1To2(px1: number, py1: number, iSeg1: Segment1): Segment2;
+declare function arcSeg2To1(iSeg2: Segment2): Segment1;
+declare function makeCorner(s1: Segment2, s2: Segment2, s3: Segment2): Segment2[];
+
 type tCartesian = [number, number];
 declare class Vector {
     ca: number;
@@ -151,26 +214,6 @@ declare class Vector {
 }
 declare function vector(ia: number, il: number, iDrawPoint: Point): Vector;
 
-declare enum SegEnum {
-    eStroke = 0,
-    eArc = 1,
-    ePointed = 2,
-    eRounded = 3,
-    eWidened = 4,
-    eWideAcc = 5,// Widened Access
-    eStart = 6
-}
-declare class Segment1 {
-    sType: SegEnum;
-    px: number;
-    py: number;
-    radius: number;
-    arcLarge: boolean;
-    arcCcw: boolean;
-    constructor(iType: SegEnum, ix: number, iy: number, iRadius: number, iArcLarge?: boolean, iArcCcw?: boolean);
-    clone(): Segment1;
-}
-
 declare class DxfSeg {
     arc: boolean;
     p1x: number;
@@ -182,6 +225,19 @@ declare class DxfSeg {
     p2y: number;
     constructor(arc: boolean, p1x: number, p1y: number, radius: number, a1: number, a2: number, p2x: number, p2y: number);
 }
+declare function dxfSegLine(p1x: number, p1y: number, p2x: number, p2y: number): DxfSeg;
+declare function dxfSegArc(p1x: number, p1y: number, radius: number, aa1: number, aa2: number, arcCcw: boolean): DxfSeg;
+declare function dxfSegCircle(p1x: number, p1y: number, radius: number): DxfSeg;
+declare class DxfWrite {
+    dxfStr: string;
+    constructor();
+    addCircle(cx: number, cy: number, radius: number): void;
+    addLine(p1x: number, p1y: number, p2x: number, p2y: number): void;
+    addArc(cx: number, cy: number, ra: number, a1: number, a2: number): void;
+    close(): void;
+    stringify(): string;
+}
+declare function dxfWriter(): DxfWrite;
 
 interface tPaxContourCircle {
     circle: boolean;
@@ -213,6 +269,16 @@ interface tPaxContourPath {
     seg: tPaxSeg[];
 }
 type tPaxContour = tPaxContourPath | tPaxContourCircle;
+declare function paxCircle(cx: number, cy: number, radius: number): tPaxContourCircle;
+declare class PaxPath {
+    seg: tPaxSeg[];
+    constructor();
+    addStart(px: number, py: number): void;
+    addStroke(px: number, py: number): void;
+    addArc(cx: number, cy: number, radius: number, large: boolean, ccw: boolean): void;
+    toJson(): tPaxContourPath;
+}
+declare function paxPath(): PaxPath;
 
 declare abstract class AContour {
     abstract circle: boolean;
@@ -227,7 +293,12 @@ declare abstract class AContour {
     abstract toDxfSeg(): DxfSeg[];
     abstract toPax(): tPaxContour;
 }
+/**
+ * class `Contour`
+ *
+ */
 declare class Contour extends AContour {
+    /** @internal */
     circle: boolean;
     segments: Segment1[];
     points: Point[];
@@ -235,14 +306,23 @@ declare class Contour extends AContour {
     debugLines: Line[];
     lastPoint: Point;
     imposedColor: string;
+    /**
+     *	@param ix - the X absolute coordinate of the first point of the contour
+     *	@param iy - the Y absolute coordinate of the first point of the contour
+     *	@param icolor - an optional color name to be used instead of the default color
+     */
     constructor(ix: number, iy: number, icolor?: string);
+    /** @internal */
     setLastPoint(ix: number, iy: number): void;
+    /** @internal */
     getLastPoint(): Point;
     addPointA(ax: number, ay: number): Contour;
     addPointAP(aa: number, al: number): Contour;
     addPointR(rx: number, ry: number): Contour;
     addPointRP(ra: number, rl: number): Contour;
+    /** @internal */
     addSeg(iSeg: Segment1): Contour;
+    /** @internal */
     addSegStroke(): Contour;
     addSegStrokeA(ax: number, ay: number): Contour;
     addSegStrokeAP(aa: number, al: number): Contour;
@@ -258,6 +338,7 @@ declare class Contour extends AContour {
     addCornerWideAcc(iRadius: number): Contour;
     closeSegStroke(): Contour;
     closeSegArc(iRadius: number, iLarge: boolean, iCcw: boolean): Contour;
+    /** @internal */
     clone(): Contour;
     translate(ix: number, iy: number): Contour;
     translatePolar(ia: number, il: number): Contour;
@@ -269,12 +350,17 @@ declare class Contour extends AContour {
     generateContour(): Contour;
     generatePoints(): Point[];
     generateLines(): Line[];
+    /** @internal */
     checkContour(ctr: Contour): void;
     check(): string;
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourPath;
 }
+/**
+ * class `ContourCircle`
+ *
+ */
 declare class ContourCircle extends AContour {
     circle: boolean;
     px: number;
@@ -282,6 +368,7 @@ declare class ContourCircle extends AContour {
     radius: number;
     imposedColor: string;
     constructor(ix: number, iy: number, iRadius: number, icolor?: string);
+    /** @internal */
     clone(): ContourCircle;
     translate(ix: number, iy: number): ContourCircle;
     translatePolar(ia: number, il: number): ContourCircle;
@@ -339,9 +426,11 @@ declare class Figure {
     rotate(ix: number, iy: number, ia: number): Figure;
     mergeFigure(ifig: Figure, mainToSecond?: boolean): void;
     clear(): void;
+    /** @internal */
     getMinMax(): void;
     getAdjustFull(iCanvasWidth: number, iCanvasHeight: number): tCanvasAdjust;
     getAdjustZoom(iCanvasWidth: number, iCanvasHeight: number): tCanvasAdjust;
+    /** @internal */
     quantifyRuler(canvasWidth: number, adjust: tCanvasAdjust): number[];
     drawRuler(ctx: CanvasRenderingContext2D, adjust: tCanvasAdjust, color: string): void;
     draw(ctx: CanvasRenderingContext2D, adjust: tCanvasAdjust, layers: tLayers): void;
@@ -510,4 +599,6 @@ interface tPackage {
 }
 declare function version_details(appPackage: tPackage): string[];
 
-export { DesignParam, EBVolume, EExtrude, EFormat, Figure, PType, Point, ShapePoint, aBFromLaLbAa, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, bisector, canvas2point, canvasTranslatePolar, checkGeom, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, degToRad, designParam, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, initGeom, initLayers, lbFromLaAaAb, lcFromLaLbAc, line, linePP, mergeFaces, oneDesignParam, pCheckbox, pDropdown, pNumber, paramListToVal, parseParamFile, point, point2canvas, prefixLog, radToDeg, radius2canvas, roundZero, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tContour, type tDesignParamList, type tExtrude, type tFaces, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tPackage, type tPageDef, type tParamDef, type tParamVal, type tParamValInFile, type tPosiOrien, type tSubDesign, type tSubInst, type tVolume, vector, version_details, withinPiPi, withinZero2Pi };
+declare function checkImpPages(pages: tAllPageDef): [boolean, string];
+
+export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFaces, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tVolume, tolerance, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi };

package/dist/index.js

@@ -172,6 +172,9 @@ function adjustTranslate(p1x, p1y, p2x, p2y, iAdjust) {
 }
 
 // src/triangle_utils.ts
+function rightTriLaFromLbLc(ilb, ilc) {
+  return Math.sqrt(ilb ** 2 + ilc ** 2);
+}
 function rightTriLbFromLaLc(ila, ilc) {
   let rlb = 0;
   if (ilc > ila) {
@@ -203,6 +206,18 @@ function aCFromLaLbLc(la, lb, lc) {
   }
   return rac;
 }
+function aCFromAaAb(iaA, iaB) {
+  let rac = 0;
+  const aA = Math.abs(withinPiPi(iaA));
+  const aB = Math.abs(withinPiPi(iaB));
+  const sum = aA + aB;
+  if (sum > Math.PI) {
+    throw `err739: impossible triangle with angles ${iaA} and ${iaB}`;
+  } else {
+    rac = Math.PI - sum;
+  }
+  return rac;
+}
 function lbFromLaAaAb(ila, iaA, iaB) {
   let rlb = 0;
   const args = [ila, iaA, iaB];
@@ -753,93 +768,17 @@ function circleCenter(ip1, ip2, ip3) {
   return rp;
 }
 
-// src/vector.ts
-var Vector = class _Vector {
-  ca;
-  cl;
-  drawPoint;
-  constructor(ia, il, iDrawPoint) {
-    this.ca = ia;
-    this.cl = il;
-    this.drawPoint = iDrawPoint;
-  }
-  draw(ctx, cAdjust, color = colors.vector) {
-    const radius = ctx.canvas.width * (0.7 / 100);
-    const [cx2, cy2] = point2canvas(this.drawPoint.cx, this.drawPoint.cy, cAdjust);
-    const [cx3, cy3] = canvasTranslatePolar(cx2, cy2, this.ca + Math.PI / 2, 2 * radius);
-    const [cx4, cy4] = canvasTranslatePolar(cx2, cy2, this.ca - Math.PI / 2, 2 * radius);
-    const p3 = this.drawPoint.translatePolar(this.ca, this.cl);
-    const [cx5, cy5] = point2canvas(p3.cx, p3.cy, cAdjust);
-    const [cx6, cy6] = canvasTranslatePolar(cx5, cy5, this.ca + 3 * Math.PI / 4, 4 * radius);
-    const [cx7, cy7] = canvasTranslatePolar(cx5, cy5, this.ca + 5 * Math.PI / 4, 4 * radius);
-    ctx.beginPath();
-    ctx.moveTo(cx3, cy3);
-    ctx.lineTo(cx4, cy4);
-    ctx.moveTo(cx2, cy2);
-    ctx.lineTo(cx5, cy5);
-    ctx.lineTo(cx6, cy6);
-    ctx.moveTo(cx5, cy5);
-    ctx.lineTo(cx7, cy7);
-    ctx.strokeStyle = color;
-    ctx.stroke();
-  }
-  getCartesian() {
-    return [this.cl * Math.cos(this.ca), this.cl * Math.sin(this.ca)];
-  }
-  setCartesian(ix, iy) {
-    return new _Vector(Math.atan2(iy, ix), Math.sqrt(ix ** 2 + iy ** 2), this.drawPoint);
-  }
-  translatePoint(ip) {
-    const [x1, y1] = this.getCartesian();
-    return ip.translate(x1, y1);
-  }
-  add(iVect) {
-    const [x1, y1] = this.getCartesian();
-    const [x2, y2] = iVect.getCartesian();
-    const rVect = this.setCartesian(x1 + x2, y1 + y2);
-    return rVect;
-  }
-  addCart(ix, iy) {
-    const [x1, y1] = this.getCartesian();
-    const rVect = this.setCartesian(x1 + ix, y1 + iy);
-    return rVect;
-  }
-  // transforms
-  translate(ix, iy) {
-    const rVec = new _Vector(this.ca, this.cl, this.drawPoint.translate(ix, iy));
-    return rVec;
-  }
-  rotate(ic, ia) {
-    const rVec = new _Vector(this.ca + ia, this.cl, this.drawPoint.rotate(ic, ia));
-    return rVec;
-  }
-  clone() {
-    const rVec = new _Vector(this.ca, this.cl, this.drawPoint.clone());
-    return rVec;
-  }
-  // point comparison
-  isEqual(iVect) {
-    const [x1, y1] = this.getCartesian();
-    const [x2, y2] = iVect.getCartesian();
-    const rb = roundZero(x2 - x1) === 0 && roundZero(y2 - y1) === 0;
-    return rb;
-  }
-  // dot product
-  dotProduct(iVect) {
-    const angle = withinPiPi(iVect.ca - this.ca);
-    return this.cl * iVect.cl * Math.cos(angle);
-  }
-  // cross product
-  crossProduct(iVect) {
-    const angle = withinPiPi(iVect.ca - this.ca);
-    return this.cl * iVect.cl * Math.sin(angle);
-  }
-};
-function vector(ia, il, iDrawPoint) {
-  return new Vector(ia, il, iDrawPoint);
-}
-
 // src/segment.ts
+var SegEnum = /* @__PURE__ */ ((SegEnum2) => {
+  SegEnum2[SegEnum2["eStroke"] = 0] = "eStroke";
+  SegEnum2[SegEnum2["eArc"] = 1] = "eArc";
+  SegEnum2[SegEnum2["ePointed"] = 2] = "ePointed";
+  SegEnum2[SegEnum2["eRounded"] = 3] = "eRounded";
+  SegEnum2[SegEnum2["eWidened"] = 4] = "eWidened";
+  SegEnum2[SegEnum2["eWideAcc"] = 5] = "eWideAcc";
+  SegEnum2[SegEnum2["eStart"] = 6] = "eStart";
+  return SegEnum2;
+})(SegEnum || {});
 function isSeg(iSegEnum) {
   let rIsSeg = false;
   if (iSegEnum === 0 /* eStroke */ || iSegEnum === 1 /* eArc */) {
@@ -1382,6 +1321,92 @@ function makeCorner(s1, s2, s3) {
   return rsegs;
 }
 
+// src/vector.ts
+var Vector = class _Vector {
+  ca;
+  cl;
+  drawPoint;
+  constructor(ia, il, iDrawPoint) {
+    this.ca = ia;
+    this.cl = il;
+    this.drawPoint = iDrawPoint;
+  }
+  draw(ctx, cAdjust, color = colors.vector) {
+    const radius = ctx.canvas.width * (0.7 / 100);
+    const [cx2, cy2] = point2canvas(this.drawPoint.cx, this.drawPoint.cy, cAdjust);
+    const [cx3, cy3] = canvasTranslatePolar(cx2, cy2, this.ca + Math.PI / 2, 2 * radius);
+    const [cx4, cy4] = canvasTranslatePolar(cx2, cy2, this.ca - Math.PI / 2, 2 * radius);
+    const p3 = this.drawPoint.translatePolar(this.ca, this.cl);
+    const [cx5, cy5] = point2canvas(p3.cx, p3.cy, cAdjust);
+    const [cx6, cy6] = canvasTranslatePolar(cx5, cy5, this.ca + 3 * Math.PI / 4, 4 * radius);
+    const [cx7, cy7] = canvasTranslatePolar(cx5, cy5, this.ca + 5 * Math.PI / 4, 4 * radius);
+    ctx.beginPath();
+    ctx.moveTo(cx3, cy3);
+    ctx.lineTo(cx4, cy4);
+    ctx.moveTo(cx2, cy2);
+    ctx.lineTo(cx5, cy5);
+    ctx.lineTo(cx6, cy6);
+    ctx.moveTo(cx5, cy5);
+    ctx.lineTo(cx7, cy7);
+    ctx.strokeStyle = color;
+    ctx.stroke();
+  }
+  getCartesian() {
+    return [this.cl * Math.cos(this.ca), this.cl * Math.sin(this.ca)];
+  }
+  setCartesian(ix, iy) {
+    return new _Vector(Math.atan2(iy, ix), Math.sqrt(ix ** 2 + iy ** 2), this.drawPoint);
+  }
+  translatePoint(ip) {
+    const [x1, y1] = this.getCartesian();
+    return ip.translate(x1, y1);
+  }
+  add(iVect) {
+    const [x1, y1] = this.getCartesian();
+    const [x2, y2] = iVect.getCartesian();
+    const rVect = this.setCartesian(x1 + x2, y1 + y2);
+    return rVect;
+  }
+  addCart(ix, iy) {
+    const [x1, y1] = this.getCartesian();
+    const rVect = this.setCartesian(x1 + ix, y1 + iy);
+    return rVect;
+  }
+  // transforms
+  translate(ix, iy) {
+    const rVec = new _Vector(this.ca, this.cl, this.drawPoint.translate(ix, iy));
+    return rVec;
+  }
+  rotate(ic, ia) {
+    const rVec = new _Vector(this.ca + ia, this.cl, this.drawPoint.rotate(ic, ia));
+    return rVec;
+  }
+  clone() {
+    const rVec = new _Vector(this.ca, this.cl, this.drawPoint.clone());
+    return rVec;
+  }
+  // point comparison
+  isEqual(iVect) {
+    const [x1, y1] = this.getCartesian();
+    const [x2, y2] = iVect.getCartesian();
+    const rb = roundZero(x2 - x1) === 0 && roundZero(y2 - y1) === 0;
+    return rb;
+  }
+  // dot product
+  dotProduct(iVect) {
+    const angle = withinPiPi(iVect.ca - this.ca);
+    return this.cl * iVect.cl * Math.cos(angle);
+  }
+  // cross product
+  crossProduct(iVect) {
+    const angle = withinPiPi(iVect.ca - this.ca);
+    return this.cl * iVect.cl * Math.sin(angle);
+  }
+};
+function vector(ia, il, iDrawPoint) {
+  return new Vector(ia, il, iDrawPoint);
+}
+
 // src/write_svg.ts
 function ff(ifloat) {
   return ifloat.toFixed(4);
@@ -1577,6 +1602,12 @@ function ff3(ifloat) {
   const rFloat = ifloat;
   return rFloat;
 }
+var PSeg = /* @__PURE__ */ ((PSeg2) => {
+  PSeg2[PSeg2["eStart"] = 0] = "eStart";
+  PSeg2[PSeg2["eStroke"] = 1] = "eStroke";
+  PSeg2[PSeg2["eArc"] = 2] = "eArc";
+  return PSeg2;
+})(PSeg || {});
 function paxCircle(cx, cy, radius) {
   const rPax = {
     circle: true,
@@ -1636,6 +1667,7 @@ function paxPath() {
 var AContour = class {
 };
 var Contour = class _Contour extends AContour {
+  /** @internal */
   circle = false;
   segments;
   points;
@@ -1643,6 +1675,11 @@ var Contour = class _Contour extends AContour {
   debugLines;
   lastPoint;
   imposedColor;
+  /**
+   *	@param ix - the X absolute coordinate of the first point of the contour
+   *	@param iy - the Y absolute coordinate of the first point of the contour
+   *	@param icolor - an optional color name to be used instead of the default color
+   */
   constructor(ix, iy, icolor = "") {
     super();
     this.segments = [new Segment1(6 /* eStart */, ix, iy, 0)];
@@ -1652,9 +1689,11 @@ var Contour = class _Contour extends AContour {
     this.lastPoint = point(ix, iy);
     this.imposedColor = icolor;
   }
+  /** @internal */
   setLastPoint(ix, iy) {
     this.lastPoint = point(ix, iy);
   }
+  /** @internal */
   getLastPoint() {
     return this.lastPoint;
   }
@@ -1682,10 +1721,12 @@ var Contour = class _Contour extends AContour {
     this.addPointA(p1.cx, p1.cy);
     return this;
   }
+  /** @internal */
   addSeg(iSeg) {
     this.segments.push(iSeg);
     return this;
   }
+  /** @internal */
   addSegStroke() {
     if (this.points.length !== 1) {
       throw `err554: contour addSegStroke with unexpected points.length ${this.points.length}`;
@@ -1894,6 +1935,7 @@ var Contour = class _Contour extends AContour {
     this.addPointA(px, py).addSegArc(iRadius, iLarge, iCcw);
     return this;
   }
+  /** @internal */
   clone() {
     const rctr = new _Contour(this.segments[0].px, this.segments[0].py);
     for (const seg of this.segments) {
@@ -1983,7 +2025,17 @@ var Contour = class _Contour extends AContour {
     if (this.points.length > 0) {
       throw `err911: addPartial, points should be used ${this.points.length}`;
     }
-    for (const seg of iContour.segments) {
+    let iCtr = iContour;
+    if (iContour.segments.length > 0) {
+      const p0 = iContour.segments[0];
+      const pLast = this.getLastPoint();
+      const dx = p0.px - pLast.cx;
+      const dy = p0.py - pLast.cy;
+      if (p0.sType === 6 /* eStart */) {
+        iCtr = iContour.translate(-dx, -dy);
+      }
+    }
+    for (const seg of iCtr.segments) {
       if (seg.sType !== 6 /* eStart */) {
         this.addSeg(seg);
         if (isSeg(seg.sType)) {
@@ -2174,6 +2226,7 @@ var Contour = class _Contour extends AContour {
     rLines.push(...this.debugLines);
     return rLines;
   }
+  /** @internal */
   checkContour(ctr) {
     if (ctr.segments[0].sType !== 6 /* eStart */) {
       throw `err412: contour check first seg is not eStart ${ctr.segments[0].sType}`;
@@ -2276,6 +2329,7 @@ var ContourCircle = class _ContourCircle extends AContour {
     this.radius = iRadius;
     this.imposedColor = icolor;
   }
+  /** @internal */
   clone() {
     const rctr = new _ContourCircle(this.px, this.py, this.radius, this.imposedColor);
     return rctr;
@@ -2493,6 +2547,7 @@ var Figure = class _Figure {
     this.secondBList = [];
     this.dynamicsList = [];
   }
+  /** @internal */
   getMinMax() {
     [this.xMin, this.xMax, this.yMin, this.yMax] = pointMinMax(this.pointList);
   }
@@ -2528,6 +2583,7 @@ var Figure = class _Figure {
     }
     return rCanvasAdjust;
   }
+  /** @internal */
   quantifyRuler(canvasWidth, adjust) {
     const minWidth = canvasWidth / 10;
     const lsizep = minWidth / adjust.scaleX;
@@ -3802,13 +3858,49 @@ function version_details(appPackage) {
   }
   return rStr;
 }
+
+// src/dynamicImport.ts
+function checkImpPages(pages) {
+  let rMsg = "";
+  let rError = false;
+  const pageNames = Object.keys(pages);
+  rMsg += `found ${pageNames.length} designs
+`;
+  if (pageNames.length === 0) {
+    rError = true;
+  }
+  const props = ["pTitle", "pDescription", "pDef", "pGeom"];
+  for (const pagN of pageNames) {
+    const pag = pages[pagN];
+    for (const prop of props) {
+      if (!(prop in pag)) {
+        rMsg += `err323: ${pagN} has no property ${prop}
+`;
+        rError = true;
+      }
+    }
+  }
+  return [rError, rMsg];
+}
 export {
+  Contour,
+  ContourCircle,
   EBVolume,
   EExtrude,
   EFormat,
+  Line,
+  PSeg,
   PType,
+  PaxPath,
+  Point,
+  SegDbg,
+  SegEnum,
+  Segment1,
+  Segment2,
   ShapePoint,
+  Vector,
   aBFromLaLbAa,
+  aCFromAaAb,
   aCFromLaLbLc,
   adjustCenter,
   adjustInit,
@@ -3816,10 +3908,13 @@ export {
   adjustScale,
   adjustTranslate,
   adjustZero,
+  arcSeg1To2,
+  arcSeg2To1,
   bisector,
   canvas2point,
   canvasTranslatePolar,
   checkGeom,
+  checkImpPages,
   circleCenter,
   colors,
   contour,
@@ -3828,6 +3923,10 @@ export {
   createParamFile,
   degToRad,
   designParam,
+  dxfSegArc,
+  dxfSegCircle,
+  dxfSegLine,
+  dxfWriter,
   ffix,
   figure,
   fileBin,
@@ -3836,28 +3935,44 @@ export {
   fileSuffix,
   fileTextContent,
   fround,
+  gSegDbg,
   initGeom,
   initLayers,
+  isActiveCorner,
+  isAddPoint,
+  isCorner,
+  isSeg,
+  isWithin,
   lbFromLaAaAb,
   lcFromLaLbAc,
   line,
   linePP,
+  makeCorner,
   mergeFaces,
   oneDesignParam,
+  orientedArc,
   pCheckbox,
   pDropdown,
   pNumber,
   paramListToVal,
   parseParamFile,
+  paxCircle,
+  paxPath,
   point,
   point2canvas,
+  pointMinMax,
   prefixLog,
   radToDeg,
   radius2canvas,
+  rightTriLaFromLbLc,
+  rightTriLbFromLaLc,
   roundZero,
+  tolerance,
   vector,
   version_details,
+  withinHPiHPi,
   withinPiPi,
-  withinZero2Pi
+  withinZero2Pi,
+  withinZeroPi
 };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.13",
+	"version": "0.5.15",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -37,26 +37,26 @@
 		"lint": "eslint .",
 		"test:unit": "vitest",
 		"test:unit:once": "vitest --run",
-		"ci": "run-s check build pretty lint test:unit:once",
-		"svgo": "svgo --config ../paramui/svgo.config.cjs -f svg -o ../paramui/static",
+		"ci": "run-s check build pretty lint test:unit:once svgo",
+		"svgo": "svgo --config ../paramui/svgo.config.cjs -f svg -o ../paramui/static/geomdocs/",
 		"clean": "shx rm -fr dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.32"
+		"@zip.js/zip.js": "^2.7.34"
 	},
 	"devDependencies": {
-		"@types/node": "^20.10.7",
-		"@typescript-eslint/eslint-plugin": "^6.18.0",
-		"@typescript-eslint/parser": "^6.18.0",
+		"@types/node": "^20.11.16",
+		"@typescript-eslint/eslint-plugin": "^6.20.0",
+		"@typescript-eslint/parser": "^6.20.0",
 		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
 		"npm-run-all": "^4.1.5",
-		"prettier": "^3.1.1",
+		"prettier": "^3.2.5",
 		"shx": "^0.3.4",
 		"svgo": "^3.2.0",
 		"tsup": "^8.0.1",
 		"typescript": "^5.3.3",
-		"vitest": "^1.1.3"
+		"vitest": "^1.2.2"
 	},
 	"exports": {
 		".": {