react-cheminfo 0.22.0 → 0.23.0

package/README.md

@@ -82,7 +82,7 @@ through a wildcard subpath exactly as `react-science` serves its own.
 | **Slideshows**             | `parseTalk`, `splitDemoLinks`, `slideActionForKey`, `parseTalkOrigin`, `buildTalkManifest` (all `/slides`)                                                                                                                                              | `Slideshow`, `SlideView`, `TalkList`, `BackToSlides` (all `/slides`), `cheminfoTalks` (`/vite`)                                                                                         |
 | **Token guard**            | `findTokenViolations`                                                                                                                                                                                                                                   | `cheminfo-check-tokens` (the bin)                                                                                                                                                       |
 | **Figures**                | `chartScale`, `chartAxisScale`, `chartAxisTitle`, `chartShare`, `chartColumnExtent`, `chartBinCounts`, `chartSeriesColor`, `rowMatrix`, `stackedMatrix`, `emptiestCorner`, `placeOverlayCard`, `overlayMetrics`                                         | `ChartFrame`, `ChartAxis`, `TrackedLineChart`, `OverlayBar`, `OverlaySelect`, `OverlaySegmented`, `OverlayToggle`, `OverlayNumber`, `OverlayLegend`, `OverlayCaption`, `OverlayReadout` |
-| **Projections**            | `pcaResult`, `embeddingResult`, `projectionTabs`, `loadingProfiles`, `explainedShares`, `confidenceEllipse`, `projectEllipse`, `pointsInPolygon`, `resolveProjectionGroups`, `PROJECTION_COPY`                                                          | `PcaViewer`, `ProjectionViewer`, `ScatterPlot`, `ScatterMatrix`                                                                                                                         |
+| **Projections**            | `pcaResult`, `embeddingResult`, `projectionTabs`, `loadingProfiles`, `explainedShares`, `confidenceEllipse`, `projectEllipse`, `pointsInPolygon`, `resolveProjectionGroups`, `resolveProjectionShapes`, `PROJECTION_COPY`                               | `PcaViewer`, `ProjectionViewer`, `ScatterPlot`, `ScatterMatrix`                                                                                                                         |
 | **Parallel coordinates**   | `parallelAxisOf`, `parallelAxisLayouts`, `parallelIncludedMask`, `parallelKeptCount`, `parallelNearestRow`, `parallelSegmentAt`, `parallelBandAt`, `parallelRangeOf`, `parallelPalette`, `parallelColorSteps`, `paintParallelLines`                     | `ParallelCoordinates`                                                                                                                                                                   |
 | **Periodic table**         | `PERIODIC_ELEMENTS`, `elementBySymbol`, `elementByAtomicNumber`, `cellOf`, `placedElements`, `elementByArrowKey`, `categorySwatch`, `CATEGORY_LABELS`                                                                                                   | `PeriodicTable`, `ElementCell`, `CategoryLegend`                                                                                                                                        |
 
@@ -390,8 +390,11 @@ const pca = new PCA(rows, { scale: true });
   }}
   samples={{
     ids,
-    groups: species,
-    groupLabel: 'Species',
+    labels: names, // what the card and the map write; `ids` stay the keys
+    groupings: [
+      { id: 'species', label: 'Species', groups: species }, // colours the dots
+      { id: 'cluster', label: 'Cluster', groups: clusters }, // shapes them
+    ],
     fields: (index) => [
       { label: 'Sepal length', value: `${rows[index][0]} cm` },
     ],
@@ -427,6 +430,13 @@ const pca = new PCA(rows, { scale: true });
   sample helped choose where the axes point and is bound to land somewhere
   reasonable, while a projected one can land anywhere — and landing far out is
   the finding, not a fault.
+- **Two groupings of the same samples, on one picture.** `samples.groupings` is a
+  list: the first colours the dots and the second shapes them, and the reader
+  can give either to any grouping from the bar and the cog. A grouping of more
+  groups than there are shapes is refused as a whole rather than drawn with two
+  groups under one mark, and the hover card names every grouping. It is what a
+  clustering is read with: the clusters it found in colour, the classes you gave
+  as shapes.
 - **Colour means one thing per tab and the legend says which.** Groups on the map
   and the pair grid, components on the other two, drawn from two orders of the
   Okabe–Ito palette that are disjoint over their first four, so blue-is-setosa on

package/lib/overlay/core/index.d.ts

@@ -10,8 +10,8 @@ export type { EmptiestCornerOptions } from './emptiestCorner.ts';
 export { emptiestCorner } from './emptiestCorner.ts';
 export type { OverlayBarFoldOptions } from './overlayCollapse.ts';
 export { overlayBarFolded, shouldCollapseOverlay } from './overlayCollapse.ts';
-export type { OverlayMarkShape } from './overlayMarks.ts';
-export { OVERLAY_MARK_SHAPES, isFilledMark } from './overlayMarks.ts';
+export type { OverlayMarkShape, OverlaySampleShape } from './overlayMarks.ts';
+export { OVERLAY_MARK_SHAPES, OVERLAY_SAMPLE_SHAPES, isFilledMark, } from './overlayMarks.ts';
 export type { OverlayDensity, OverlayMetrics, OverlayPointerKind, } from './overlayMetrics.ts';
 export { overlayMetrics } from './overlayMetrics.ts';
 export type { OverlayCorner, OverlayCornerStyle, OverlayPlacement, } from './overlayPlacement.ts';

package/lib/overlay/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/overlay/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,YAAY,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,YAAY,EACV,cAAc,EACd,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EACV,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/overlay/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,YAAY,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,cAAc,EACd,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EACV,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC"}

package/lib/overlay/core/index.js

@@ -8,7 +8,7 @@
  */
 export { emptiestCorner } from "./emptiestCorner.js";
 export { overlayBarFolded, shouldCollapseOverlay } from "./overlayCollapse.js";
-export { OVERLAY_MARK_SHAPES, isFilledMark } from "./overlayMarks.js";
+export { OVERLAY_MARK_SHAPES, OVERLAY_SAMPLE_SHAPES, isFilledMark, } from "./overlayMarks.js";
 export { overlayMetrics } from "./overlayMetrics.js";
 export { overlayCornerStyle } from "./overlayPlacement.js";
 export { overlayTier, overlayTierWidths } from "./overlayTiers.js";

package/lib/overlay/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/overlay/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAKnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/overlay/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,GACb,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAKnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC"}

package/lib/overlay/core/overlayMarks.d.ts

@@ -8,16 +8,31 @@
  * describe its own marks without a `core` module reaching into a `ui` one.
  */
 /** Which mark a legend entry, a marker or a series stands for. */
-export type OverlayMarkShape = 'dot' | 'ring' | 'square' | 'line' | 'dashed' | 'cross';
+export type OverlayMarkShape = 'dot' | 'ring' | 'square' | 'triangle' | 'diamond' | 'triangle-down' | 'line' | 'dashed' | 'cross';
+/**
+ * The shapes a sample's own dot can take, which is how a second grouping of
+ * the same samples is drawn while colour keeps the first.
+ */
+export type OverlaySampleShape = Extract<OverlayMarkShape, 'dot' | 'square' | 'triangle' | 'diamond' | 'triangle-down'>;
 /**
  * Every mark, in the order a picker offers them.
  *
- * The first three separate one filled thing from another by colour alone; the
- * last three carry a second meaning on one figure — a line for a component
- * beside dots for the samples — which is what keeps a figure readable when the
- * colours run out or the reader does not separate two of them.
+ * The filled ones come first and separate one thing from another by colour or
+ * by outline alone; the last three carry a second meaning on one figure — a
+ * line for a component beside dots for the samples — which is what keeps a
+ * figure readable when the colours run out or the reader does not separate two
+ * of them.
  */
 export declare const OVERLAY_MARK_SHAPES: readonly OverlayMarkShape[];
+/**
+ * The shapes a second grouping is given, in the order its groups are listed.
+ *
+ * Five, because that is about where a reader stops telling small shapes apart
+ * at a glance. None of them is a ring or a cross: a ring is a sample placed
+ * into a finished model and a cross is a group's average, and a sample drawn
+ * as either would be read as one of those.
+ */
+export declare const OVERLAY_SAMPLE_SHAPES: readonly OverlaySampleShape[];
 /**
  * Whether a mark is drawn as a solid area rather than as a stroke.
  *

package/lib/overlay/core/overlayMarks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlayMarks.d.ts","sourceRoot":"","sources":["../../../src/overlay/core/overlayMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,kEAAkE;AAClE,MAAM,MAAM,gBAAgB,GAC1B,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE1D;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAAS,gBAAgB,EAO1D,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE7D"}
+{"version":3,"file":"overlayMarks.d.ts","sourceRoot":"","sources":["../../../src/overlay/core/overlayMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,kEAAkE;AAClE,MAAM,MAAM,gBAAgB,GACxB,KAAK,GACL,MAAM,GACN,QAAQ,GACR,UAAU,GACV,SAAS,GACT,eAAe,GACf,MAAM,GACN,QAAQ,GACR,OAAO,CAAC;AAEZ;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,gBAAgB,EAChB,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,eAAe,CAC5D,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAAS,gBAAgB,EAU1D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,kBAAkB,EAM9D,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE7D"}

package/lib/overlay/core/overlayMarks.js

@@ -10,19 +10,38 @@
 /**
  * Every mark, in the order a picker offers them.
  *
- * The first three separate one filled thing from another by colour alone; the
- * last three carry a second meaning on one figure — a line for a component
- * beside dots for the samples — which is what keeps a figure readable when the
- * colours run out or the reader does not separate two of them.
+ * The filled ones come first and separate one thing from another by colour or
+ * by outline alone; the last three carry a second meaning on one figure — a
+ * line for a component beside dots for the samples — which is what keeps a
+ * figure readable when the colours run out or the reader does not separate two
+ * of them.
  */
 export const OVERLAY_MARK_SHAPES = [
     'dot',
     'ring',
     'square',
+    'triangle',
+    'diamond',
+    'triangle-down',
     'line',
     'dashed',
     'cross',
 ];
+/**
+ * The shapes a second grouping is given, in the order its groups are listed.
+ *
+ * Five, because that is about where a reader stops telling small shapes apart
+ * at a glance. None of them is a ring or a cross: a ring is a sample placed
+ * into a finished model and a cross is a group's average, and a sample drawn
+ * as either would be read as one of those.
+ */
+export const OVERLAY_SAMPLE_SHAPES = [
+    'dot',
+    'square',
+    'triangle',
+    'diamond',
+    'triangle-down',
+];
 /**
  * Whether a mark is drawn as a solid area rather than as a stroke.
  *
@@ -33,6 +52,13 @@ export const OVERLAY_MARK_SHAPES = [
  * @returns `true` for the filled marks, `false` for the drawn ones.
  */
 export function isFilledMark(shape) {
-    return shape === 'dot' || shape === 'square';
+    return FILLED_MARKS.has(shape);
 }
+const FILLED_MARKS = new Set([
+    'dot',
+    'square',
+    'triangle',
+    'diamond',
+    'triangle-down',
+]);
 //# sourceMappingURL=overlayMarks.js.map

package/lib/overlay/core/overlayMarks.js.map

@@ -1 +1 @@
-{"version":3,"file":"overlayMarks.js","sourceRoot":"","sources":["../../../src/overlay/core/overlayMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAgC;IAC9D,KAAK;IACL,MAAM;IACN,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,OAAO;CACR,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,KAAuB;IAClD,OAAO,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,QAAQ,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"overlayMarks.js","sourceRoot":"","sources":["../../../src/overlay/core/overlayMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAuBH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAgC;IAC9D,KAAK;IACL,MAAM;IACN,QAAQ;IACR,UAAU;IACV,SAAS;IACT,eAAe;IACf,MAAM;IACN,QAAQ;IACR,OAAO;CACR,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC;IAClE,KAAK;IACL,QAAQ;IACR,UAAU;IACV,SAAS;IACT,eAAe;CAChB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,KAAuB;IAClD,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,YAAY,GAAkC,IAAI,GAAG,CAAmB;IAC5E,KAAK;IACL,QAAQ;IACR,UAAU;IACV,SAAS;IACT,eAAe;CAChB,CAAC,CAAC"}

package/lib/overlay/ui/OverlayLegendMark.js

@@ -30,6 +30,11 @@ const MARK_GEOMETRY = {
     dot: _jsx("circle", { cx: "6", cy: "6", r: "4.2" }),
     ring: _jsx("circle", { cx: "6", cy: "6", r: "3.4", strokeWidth: "2.2" }),
     square: _jsx("rect", { x: "2", y: "2", width: "8", height: "8", rx: "1.5" }),
+    // Balanced on the centre of the box, as the dots they name are balanced on
+    // their samples.
+    triangle: _jsx("path", { d: "M6 0.8L10.5 8.6L1.5 8.6Z" }),
+    diamond: _jsx("path", { d: "M6 1L11 6L6 11L1 6Z" }),
+    'triangle-down': _jsx("path", { d: "M1.5 3.4L10.5 3.4L6 11.2Z" }),
     line: _jsx("line", { x1: "0.5", y1: "6", x2: "11.5", y2: "6", strokeWidth: "2.8" }),
     dashed: (_jsx("line", { x1: "0.5", y1: "6", x2: "11.5", y2: "6", strokeWidth: "2.8", strokeDasharray: "3.4 2.6" })),
     cross: _jsx("path", { d: "M2.2 2.2 L9.8 9.8 M9.8 2.2 L2.2 9.8", strokeWidth: "2.4" }),

package/lib/overlay/ui/OverlayLegendMark.js.map

@@ -1 +1 @@
-{"version":3,"file":"OverlayLegendMark.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayLegendMark.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAuBvD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC7D,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAEnC,OAAO,CACL,cACE,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,OAAO,EAAC,WAAW,iBACP,MAAM,EAClB,SAAS,EAAC,OAAO,EACjB,KAAK,EAAE;YACL,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SACnC,YAED,YACE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAC7B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAC/B,aAAa,EAAC,OAAO,YAEpB,aAAa,CAAC,KAAK,CAAC,GACnB,GACA,CACP,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa,GAA2C;IAC5D,GAAG,EAAE,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,GAAG;IACrC,IAAI,EAAE,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,EAAC,WAAW,EAAC,KAAK,GAAG;IACxD,MAAM,EAAE,eAAM,CAAC,EAAC,GAAG,EAAC,CAAC,EAAC,GAAG,EAAC,KAAK,EAAC,GAAG,EAAC,MAAM,EAAC,GAAG,EAAC,EAAE,EAAC,KAAK,GAAG;IAC1D,IAAI,EAAE,eAAM,EAAE,EAAC,KAAK,EAAC,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,MAAM,EAAC,EAAE,EAAC,GAAG,EAAC,WAAW,EAAC,KAAK,GAAG;IACjE,MAAM,EAAE,CACN,eACE,EAAE,EAAC,KAAK,EACR,EAAE,EAAC,GAAG,EACN,EAAE,EAAC,MAAM,EACT,EAAE,EAAC,GAAG,EACN,WAAW,EAAC,KAAK,EACjB,eAAe,EAAC,SAAS,GACzB,CACH;IACD,KAAK,EAAE,eAAM,CAAC,EAAC,qCAAqC,EAAC,WAAW,EAAC,KAAK,GAAG;CAC1E,CAAC;AAEF;;;;GAIG;AACH,MAAM,aAAa,GAAG,IAAI,CAAC"}
+{"version":3,"file":"OverlayLegendMark.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayLegendMark.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAuBvD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC7D,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAEnC,OAAO,CACL,cACE,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,OAAO,EAAC,WAAW,iBACP,MAAM,EAClB,SAAS,EAAC,OAAO,EACjB,KAAK,EAAE;YACL,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SACnC,YAED,YACE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAC7B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAC/B,aAAa,EAAC,OAAO,YAEpB,aAAa,CAAC,KAAK,CAAC,GACnB,GACA,CACP,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa,GAA2C;IAC5D,GAAG,EAAE,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,GAAG;IACrC,IAAI,EAAE,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,EAAC,WAAW,EAAC,KAAK,GAAG;IACxD,MAAM,EAAE,eAAM,CAAC,EAAC,GAAG,EAAC,CAAC,EAAC,GAAG,EAAC,KAAK,EAAC,GAAG,EAAC,MAAM,EAAC,GAAG,EAAC,EAAE,EAAC,KAAK,GAAG;IAC1D,2EAA2E;IAC3E,iBAAiB;IACjB,QAAQ,EAAE,eAAM,CAAC,EAAC,0BAA0B,GAAG;IAC/C,OAAO,EAAE,eAAM,CAAC,EAAC,qBAAqB,GAAG;IACzC,eAAe,EAAE,eAAM,CAAC,EAAC,2BAA2B,GAAG;IACvD,IAAI,EAAE,eAAM,EAAE,EAAC,KAAK,EAAC,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,MAAM,EAAC,EAAE,EAAC,GAAG,EAAC,WAAW,EAAC,KAAK,GAAG;IACjE,MAAM,EAAE,CACN,eACE,EAAE,EAAC,KAAK,EACR,EAAE,EAAC,GAAG,EACN,EAAE,EAAC,MAAM,EACT,EAAE,EAAC,GAAG,EACN,WAAW,EAAC,KAAK,EACjB,eAAe,EAAC,SAAS,GACzB,CACH;IACD,KAAK,EAAE,eAAM,CAAC,EAAC,qCAAqC,EAAC,WAAW,EAAC,KAAK,GAAG;CAC1E,CAAC;AAEF;;;;GAIG;AACH,MAAM,aAAa,GAAG,IAAI,CAAC"}

package/lib/projection/core/index.d.ts

@@ -25,13 +25,13 @@ export { pcaResult } from './pcaResult.ts';
 export type { ProjectionCopy } from './projectionCopy.ts';
 export { PROJECTION_COPY } from './projectionCopy.ts';
 export type { ProjectionCopyPatch } from './projectionCopyPatch.ts';
-export type { ProjectionColorBy, ProjectionOptionId, ProjectionOptions, ProjectionVariablesView, } from './projectionOptions.ts';
+export type { ProjectionOptionId, ProjectionOptions, ProjectionVariablesView, } from './projectionOptions.ts';
 export { mergeProjectionCopy } from './mergeProjectionCopy.ts';
-export { DEFAULT_PROJECTION_OPTIONS } from './projectionOptions.ts';
+export { DEFAULT_PROJECTION_OPTIONS, NO_GROUPING, } from './projectionOptions.ts';
 export type { ProjectionChoiceWords, ProjectionOutlineWords, ProjectionPanelWords, ProjectionReasonWords, } from './projectionPanelWords.ts';
 export type { ProjectionAxis, ProjectionLoadings, ProjectionMarker, ProjectionResult, } from './projectionResult.ts';
-export type { ProjectionField, ProjectionSamples, ResolvedProjectionGroups, } from './projectionSamples.ts';
-export { resolveProjectionGroups } from './projectionSamples.ts';
+export type { ProjectionField, ProjectionGrouping, ProjectionSamples, ResolvedProjectionGroups, ResolvedProjectionShapes, } from './projectionSamples.ts';
+export { projectionGrouping, resolveProjectionGroups, resolveProjectionShapes, } from './projectionGroupings.ts';
 export type { ProjectionBarWords, ProjectionHelp, ProjectionHelpExample, } from './projectionStrings.ts';
 export { PROJECTION_HELP } from './projectionStrings.ts';
 export type { ProjectionTab } from './projectionTabs.ts';

package/lib/projection/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/projection/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,YAAY,EACV,cAAc,EACd,eAAe,EACf,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,YAAY,EACV,cAAc,EACd,eAAe,EACf,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EACV,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,YAAY,EACV,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,eAAe,EACf,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,YAAY,EACV,kBAAkB,EAClB,cAAc,EACd,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EACV,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/projection/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,YAAY,EACV,cAAc,EACd,eAAe,EACf,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,YAAY,EACV,cAAc,EACd,eAAe,EACf,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EACV,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,0BAA0B,EAC1B,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EACV,kBAAkB,EAClB,cAAc,EACd,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EACV,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,mBAAmB,CAAC"}

package/lib/projection/core/index.js

@@ -19,8 +19,8 @@ export { fillCopy } from "./fillCopy.js";
 export { pcaResult } from "./pcaResult.js";
 export { PROJECTION_COPY } from "./projectionCopy.js";
 export { mergeProjectionCopy } from "./mergeProjectionCopy.js";
-export { DEFAULT_PROJECTION_OPTIONS } from "./projectionOptions.js";
-export { resolveProjectionGroups } from "./projectionSamples.js";
+export { DEFAULT_PROJECTION_OPTIONS, NO_GROUPING, } from "./projectionOptions.js";
+export { projectionGrouping, resolveProjectionGroups, resolveProjectionShapes, } from "./projectionGroupings.js";
 export { PROJECTION_HELP } from "./projectionStrings.js";
 export { projectionTabs } from "./projectionTabs.js";
 export { resolveProjectionOptions } from "./resolveProjectionOptions.js";

package/lib/projection/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/projection/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAkBpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAMjE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOzE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/projection/core/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,0BAA0B,EAC1B,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAoBhC,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOzE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,mBAAmB,CAAC"}

package/lib/projection/core/projectionCopy.d.ts

@@ -66,6 +66,8 @@ export interface ProjectionCopy {
         projected: string;
         /** The title of a key whose colour stands for nothing, so only shape is left. */
         shapes: string;
+        /** What the shape stands for, after what the colour does. Carries `{shapes}`. */
+        shapedBy: string;
     };
     /** The sentences the viewer builds from the data. */
     sentence: {

package/lib/projection/core/projectionCopy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionCopy.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionCopy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projectionCopy.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionCopy.ts"],"names":[],"mappings":"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"}

package/lib/projection/core/projectionCopy.js

@@ -47,6 +47,7 @@ export const PROJECTION_COPY = {
         notOutlined: 'Not outlined: too few samples.',
         projected: 'Hollow = added after the map was built',
         shapes: 'Shape = what each mark is.',
+        shapedBy: 'Shape = {shapes}.',
     },
     sentence: {
         sharesFirst: 'Component 1 accounts for {percent} of the differences between your samples.',

package/lib/projection/core/projectionCopy.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionCopy.js","sourceRoot":"","sources":["../../../src/projection/core/projectionCopy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAgIhC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAmB;IAC7C,GAAG,EAAE;QACH,GAAG,EAAE,KAAK;QACV,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,cAAc;QACzB,MAAM,EAAE,wBAAwB;KACjC;IACD,QAAQ,EAAE,oBAAoB;IAC9B,GAAG,EAAE,oBAAoB;IACzB,KAAK,EAAE,sBAAsB;IAC7B,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,uBAAuB;IAC/B,OAAO,EAAE,wBAAwB;IACjC,KAAK,EAAE;QACL,GAAG,EAAE,mLAAmL;QACxL,KAAK,EACH,+PAA+P;QACjQ,KAAK,EACH,gHAAgH;QAClH,mBAAmB,EACjB,mHAAmH;QACrH,cAAc,EACZ,8HAA8H;QAChI,eAAe,EACb,2JAA2J;QAC7J,eAAe,EACb,6GAA6G;QAC/G,MAAM,EACJ,8IAA8I;KACjJ;IACD,MAAM,EAAE;QACN,GAAG,EAAE,mHAAmH;QACxH,KAAK,EACH,gPAAgP;QAClP,YAAY,EAAE,oBAAoB;QAClC,KAAK,EACH,mHAAmH;QACrH,eAAe,EACb,sGAAsG;QACxG,gBAAgB,EACd,6GAA6G;QAC/G,iBAAiB,EACf,uHAAuH;QACzH,eAAe,EACb,8FAA8F;QAChG,MAAM,EACJ,sGAAsG;QACxG,WAAW,EAAE,gCAAgC;QAC7C,SAAS,EAAE,wCAAwC;QACnD,MAAM,EAAE,4BAA4B;KACrC;IACD,QAAQ,EAAE;QACR,WAAW,EACT,6EAA6E;QAC/E,YAAY,EACV,gHAAgH;QAClH,cAAc,EACZ,4GAA4G;QAC9G,SAAS,EAAE,sCAAsC;QACjD,aAAa,EAAE,kDAAkD;QACjE,YAAY,EAAE,WAAW;QACzB,QAAQ,EAAE,qBAAqB;QAC/B,WAAW,EAAE,yBAAyB;QACtC,aAAa,EAAE,wCAAwC;QACvD,SAAS,EACP,8HAA8H;QAChI,YAAY,EAAE,0BAA0B;QACxC,SAAS,EACP,kFAAkF;KACrF;IACD,MAAM,EAAE;QACN,eAAe,EAAE,mBAAmB;QACpC,SAAS,EAAE,YAAY;QACvB,cAAc,EAAE,iBAAiB;QACjC,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE;QACL,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,WAAW;QACtB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,QAAQ;KACjB;CACF,CAAC"}
+{"version":3,"file":"projectionCopy.js","sourceRoot":"","sources":["../../../src/projection/core/projectionCopy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAkIhC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAmB;IAC7C,GAAG,EAAE;QACH,GAAG,EAAE,KAAK;QACV,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,cAAc;QACzB,MAAM,EAAE,wBAAwB;KACjC;IACD,QAAQ,EAAE,oBAAoB;IAC9B,GAAG,EAAE,oBAAoB;IACzB,KAAK,EAAE,sBAAsB;IAC7B,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,uBAAuB;IAC/B,OAAO,EAAE,wBAAwB;IACjC,KAAK,EAAE;QACL,GAAG,EAAE,mLAAmL;QACxL,KAAK,EACH,+PAA+P;QACjQ,KAAK,EACH,gHAAgH;QAClH,mBAAmB,EACjB,mHAAmH;QACrH,cAAc,EACZ,8HAA8H;QAChI,eAAe,EACb,2JAA2J;QAC7J,eAAe,EACb,6GAA6G;QAC/G,MAAM,EACJ,8IAA8I;KACjJ;IACD,MAAM,EAAE;QACN,GAAG,EAAE,mHAAmH;QACxH,KAAK,EACH,gPAAgP;QAClP,YAAY,EAAE,oBAAoB;QAClC,KAAK,EACH,mHAAmH;QACrH,eAAe,EACb,sGAAsG;QACxG,gBAAgB,EACd,6GAA6G;QAC/G,iBAAiB,EACf,uHAAuH;QACzH,eAAe,EACb,8FAA8F;QAChG,MAAM,EACJ,sGAAsG;QACxG,WAAW,EAAE,gCAAgC;QAC7C,SAAS,EAAE,wCAAwC;QACnD,MAAM,EAAE,4BAA4B;QACpC,QAAQ,EAAE,mBAAmB;KAC9B;IACD,QAAQ,EAAE;QACR,WAAW,EACT,6EAA6E;QAC/E,YAAY,EACV,gHAAgH;QAClH,cAAc,EACZ,4GAA4G;QAC9G,SAAS,EAAE,sCAAsC;QACjD,aAAa,EAAE,kDAAkD;QACjE,YAAY,EAAE,WAAW;QACzB,QAAQ,EAAE,qBAAqB;QAC/B,WAAW,EAAE,yBAAyB;QACtC,aAAa,EAAE,wCAAwC;QACvD,SAAS,EACP,8HAA8H;QAChI,YAAY,EAAE,0BAA0B;QACxC,SAAS,EACP,kFAAkF;KACrF;IACD,MAAM,EAAE;QACN,eAAe,EAAE,mBAAmB;QACpC,SAAS,EAAE,YAAY;QACvB,cAAc,EAAE,iBAAiB;QACjC,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE;QACL,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,WAAW;QACtB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,QAAQ;KACjB;CACF,CAAC"}

package/lib/projection/core/projectionGroupings.d.ts

@@ -0,0 +1,44 @@
+/**
+ * How the groupings a page hands in become what a figure draws: the one that
+ * colours the dots, painted from the shared palette, and the one that shapes
+ * them, given one shape per group.
+ *
+ * Both are cut the same way — the page's own order first, then every group in
+ * the order its first row names it — so a group keeps its colour and its shape
+ * however the rows are filtered.
+ */
+import type { ProjectionGrouping, ProjectionSamples, ResolvedProjectionGroups, ResolvedProjectionShapes } from './projectionSamples.ts';
+/**
+ * The grouping a set of samples is coloured by, in a shape a legend and a plot
+ * can both read.
+ *
+ * A group named in `order` but held by no row is kept, so a legend does not
+ * reshuffle when a filter empties one; a row naming a group that is not in
+ * `order` is appended in the order it appears.
+ * @param grouping - The grouping, or nothing when the dots are not coloured.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved groups. No grouping gives no entries at all, and every
+ * row lands at `-1`.
+ */
+export declare function resolveProjectionGroups(grouping: ProjectionGrouping | undefined, count: number): ResolvedProjectionGroups;
+/**
+ * The grouping a set of samples is shaped by, one shape per group.
+ *
+ * A grouping of more groups than there are shapes is refused as a whole rather
+ * than drawn with two groups sharing a shape, or with the last ones falling
+ * back to a disc: either would put two groups under one mark, which is the one
+ * thing a key cannot undo.
+ * @param grouping - The grouping, or nothing when the dots are not shaped.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved shapes, or `null` when there is no grouping or its
+ * groups outnumber the shapes.
+ */
+export declare function resolveProjectionShapes(grouping: ProjectionGrouping | undefined, count: number): ResolvedProjectionShapes | null;
+/**
+ * The grouping carrying an id.
+ * @param samples - Who the rows are.
+ * @param id - The id asked for.
+ * @returns The grouping, or `undefined` when none carries it.
+ */
+export declare function projectionGrouping(samples: ProjectionSamples, id: string): ProjectionGrouping | undefined;
+//# sourceMappingURL=projectionGroupings.d.ts.map

package/lib/projection/core/projectionGroupings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectionGroupings.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionGroupings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,EACxC,KAAK,EAAE,MAAM,GACZ,wBAAwB,CAK1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,EACxC,KAAK,EAAE,MAAM,GACZ,wBAAwB,GAAG,IAAI,CASjC;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,iBAAiB,EAC1B,EAAE,EAAE,MAAM,GACT,kBAAkB,GAAG,SAAS,CAKhC"}

package/lib/projection/core/projectionGroupings.js

@@ -0,0 +1,132 @@
+/**
+ * How the groupings a page hands in become what a figure draws: the one that
+ * colours the dots, painted from the shared palette, and the one that shapes
+ * them, given one shape per group.
+ *
+ * Both are cut the same way — the page's own order first, then every group in
+ * the order its first row names it — so a group keeps its colour and its shape
+ * however the rows are filtered.
+ */
+import { CHART_SERIES_COLORS, chartSeriesColor, } from "../../chart/core/chartPalette.js";
+import { OVERLAY_SAMPLE_SHAPES } from "../../overlay/core/overlayMarks.js";
+/**
+ * The grouping a set of samples is coloured by, in a shape a legend and a plot
+ * can both read.
+ *
+ * A group named in `order` but held by no row is kept, so a legend does not
+ * reshuffle when a filter empties one; a row naming a group that is not in
+ * `order` is appended in the order it appears.
+ * @param grouping - The grouping, or nothing when the dots are not coloured.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved groups. No grouping gives no entries at all, and every
+ * row lands at `-1`.
+ */
+export function resolveProjectionGroups(grouping, count) {
+    const { label, entries, rowOf } = partition(grouping, count);
+    const colored = entries.map((entry) => ({ ...entry, color: '' }));
+    paintGroups(colored, grouping?.colors);
+    return { label, entries: colored, groupOf: rowOf };
+}
+/**
+ * The grouping a set of samples is shaped by, one shape per group.
+ *
+ * A grouping of more groups than there are shapes is refused as a whole rather
+ * than drawn with two groups sharing a shape, or with the last ones falling
+ * back to a disc: either would put two groups under one mark, which is the one
+ * thing a key cannot undo.
+ * @param grouping - The grouping, or nothing when the dots are not shaped.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved shapes, or `null` when there is no grouping or its
+ * groups outnumber the shapes.
+ */
+export function resolveProjectionShapes(grouping, count) {
+    if (grouping === undefined)
+        return null;
+    const { label, entries, rowOf } = partition(grouping, count);
+    if (entries.length > OVERLAY_SAMPLE_SHAPES.length)
+        return null;
+    const shaped = entries.map((entry, index) => ({
+        ...entry,
+        shape: OVERLAY_SAMPLE_SHAPES[index] ?? 'dot',
+    }));
+    return { label, entries: shaped, shapeOf: rowOf };
+}
+/**
+ * The grouping carrying an id.
+ * @param samples - Who the rows are.
+ * @param id - The id asked for.
+ * @returns The grouping, or `undefined` when none carries it.
+ */
+export function projectionGrouping(samples, id) {
+    for (const grouping of samples.groupings ?? NO_GROUPINGS) {
+        if (grouping.id === id)
+            return grouping;
+    }
+    return undefined;
+}
+const NO_GROUP = -1;
+const DEFAULT_GROUP_LABEL = 'Group';
+const NO_GROUPINGS = [];
+function partition(grouping, count) {
+    const rowCount = Number.isFinite(count) ? Math.max(0, Math.floor(count)) : 0;
+    const label = grouping?.label ?? DEFAULT_GROUP_LABEL;
+    const rowOf = new Int32Array(rowCount).fill(NO_GROUP);
+    const entries = [];
+    if (grouping === undefined)
+        return { label, entries, rowOf };
+    const indexOfGroup = new Map();
+    for (const id of grouping.order ?? []) {
+        appendGroup(entries, indexOfGroup, id);
+    }
+    for (let row = 0; row < rowCount; row++) {
+        const id = grouping.groups[row];
+        if (id === undefined)
+            continue;
+        const at = appendGroup(entries, indexOfGroup, id);
+        rowOf[row] = at;
+        const entry = entries[at];
+        if (entry !== undefined)
+            entry.count++;
+    }
+    return { label, entries, rowOf };
+}
+function appendGroup(entries, indexOfGroup, id) {
+    const known = indexOfGroup.get(id);
+    if (known !== undefined)
+        return known;
+    const at = entries.length;
+    indexOfGroup.set(id, at);
+    entries.push({ id, label: id, count: 0 });
+    return at;
+}
+function paintGroups(entries, pinned) {
+    // Every pinned colour is taken out of the palette before any group draws
+    // from it, so pinning the third group's hue onto the first does not leave
+    // two groups wearing it.
+    const taken = new Set();
+    if (pinned !== undefined) {
+        for (const entry of entries) {
+            const color = pinned[entry.id];
+            if (color !== undefined)
+                taken.add(color.toLowerCase());
+        }
+    }
+    let cursor = 0;
+    for (const entry of entries) {
+        const own = pinned?.[entry.id];
+        if (own !== undefined) {
+            entry.color = own;
+            continue;
+        }
+        let color = chartSeriesColor(cursor, 'group');
+        while (cursor < CHART_SERIES_COLORS.length &&
+            taken.has(color.toLowerCase())) {
+            cursor++;
+            color = chartSeriesColor(cursor, 'group');
+        }
+        cursor++;
+        taken.add(color.toLowerCase());
+        entry.color = color;
+    }
+}
+//# sourceMappingURL=projectionGroupings.js.map

package/lib/projection/core/projectionGroupings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectionGroupings.js","sourceRoot":"","sources":["../../../src/projection/core/projectionGroupings.ts"],"names":[],"mappings":"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"}

package/lib/projection/core/projectionOptions.d.ts

@@ -12,10 +12,10 @@ export type ProjectionVariablesView =
 /** The one selected sample, rebuilt from the components shown. */
  | 'sample';
 /**
- * What decides a dot's colour on the map: `'group'`, `'none'`, or nothing else
- * in this release.
+ * The word for "no grouping" wherever an option names one, which is why no
+ * grouping may be called it.
  */
-export type ProjectionColorBy = 'group' | 'none';
+export declare const NO_GROUPING = "none";
 /** What the figure is currently showing. Every field is a control in the floating bar. */
 export interface ProjectionOptions {
     /**
@@ -40,10 +40,20 @@ export interface ProjectionOptions {
      */
     cloudGesture: CloudGesture;
     /**
-     * What decides a dot's colour.
-     * @default 'group'
+     * Which grouping colours the dots, by its id, or `'none'`. An id no grouping
+     * carries — the empty string, or one saved on other data — takes the first
+     * grouping.
+     * @default ''
      */
-    colorBy: ProjectionColorBy;
+    colorBy: string;
+    /**
+     * Which grouping gives the dots their shapes, by its id, or `'none'`. An id
+     * no grouping carries takes the second grouping — the first when the colour
+     * has taken the second — and a grouping of more groups than there are
+     * shapes is not drawn.
+     * @default ''
+     */
+    shapeBy: string;
     /**
      * How large the group outlines are, or `null` for none.
      * @default { kind: 'coverage', probability: 0.95 }

package/lib/projection/core/projectionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,2CAA2C;AAC3C,MAAM,MAAM,uBAAuB;AACjC,uFAAuF;AACrF,QAAQ;AACV,4EAA4E;GAC1E,SAAS;AACX,qFAAqF;GACnF,UAAU;AACZ,kEAAkE;GAChE,QAAQ,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEjD,0FAA0F;AAC1F,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAC3B;;;OAGG;IACH,OAAO,EAAE,iBAAiB,CAAC;IAC3B;;;OAGG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,aAAa,EAAE,uBAAuB,CAAC;IACvC;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,aAAa,EAAE,UAAU,GAAG,WAAW,CAAC;IACxC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,yEAAyE;AACzE,MAAM,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC;AAEzD,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B,EAAE,iBAoBxC,CAAC"}
+{"version":3,"file":"projectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,2CAA2C;AAC3C,MAAM,MAAM,uBAAuB;AACjC,uFAAuF;AACrF,QAAQ;AACV,4EAA4E;GAC1E,SAAS;AACX,qFAAqF;GACnF,UAAU;AACZ,kEAAkE;GAChE,QAAQ,CAAC;AAEb;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAS,CAAC;AAElC,0FAA0F;AAC1F,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAC3B;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,aAAa,EAAE,uBAAuB,CAAC;IACvC;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,aAAa,EAAE,UAAU,GAAG,WAAW,CAAC;IACxC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,yEAAyE;AACzE,MAAM,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC;AAEzD,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B,EAAE,iBAqBxC,CAAC"}

package/lib/projection/core/projectionOptions.js

@@ -1,10 +1,16 @@
+/**
+ * The word for "no grouping" wherever an option names one, which is why no
+ * grouping may be called it.
+ */
+export const NO_GROUPING = 'none';
 /** What the figure shows when a site overrides nothing. */
 export const DEFAULT_PROJECTION_OPTIONS = {
     xAxis: 0,
     yAxis: 1,
     zAxis: 2,
     cloudGesture: 'turn',
-    colorBy: 'group',
+    colorBy: '',
+    shapeBy: '',
     ellipse: { kind: 'coverage', probability: 0.95 },
     pointRadius: 3.5,
     showGroupMeans: false,

package/lib/projection/core/projectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAkIA,2DAA2D;AAC3D,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,YAAY,EAAE,MAAM;IACpB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE;IAChD,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,CAAC;IACZ,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,SAAS;CACtB,CAAC"}
+{"version":3,"file":"projectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAeA;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC;AAyHlC,2DAA2D;AAC3D,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,YAAY,EAAE,MAAM;IACpB,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE;IAChD,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,CAAC;IACZ,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,SAAS;CACtB,CAAC"}

package/lib/projection/core/projectionPanelWords.d.ts

@@ -38,6 +38,12 @@ export interface ProjectionPanelWords {
 export interface ProjectionReasonWords {
     /** Why the colour cannot be set: the samples carry no groups. */
     noGroups: string;
+    /** Why the shape cannot be set: the samples carry no groups. */
+    noGroupsToShape: string;
+    /** Why a grouping is greyed in the shape picker: the colour already draws it. */
+    shapeIsColour: string;
+    /** Why a grouping is greyed in the shape picker: it has more groups than shapes. */
+    tooManyShapes: string;
     /** Why the map's outlines cannot be set while nothing is coloured. */
     uncolouredOutlines: string;
     /** Why the cloud's shells cannot be set while nothing is coloured. */

package/lib/projection/core/projectionPanelWords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionPanelWords.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC;;;;;;;OAOG;IACH,IAAI,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACzC;;;;;OAKG;IACH,OAAO,EAAE;QACP,2EAA2E;QAC3E,IAAI,EAAE,MAAM,CAAC;QACb,0CAA0C;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,yDAAyD;QACzD,SAAS,EAAE,MAAM,CAAC;QAClB,gFAAgF;QAChF,QAAQ,EAAE,MAAM,CAAC;QACjB,sEAAsE;QACtE,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjD,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,gFAAgF;AAChF,MAAM,WAAW,sBAAsB;IACrC,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,uEAAuE;AACvE,eAAO,MAAM,sBAAsB,EAAE,oBA6BpC,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,EAAE,qBAYrC,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,qBAIrC,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,EAAE,sBAKtC,CAAC"}
+{"version":3,"file":"projectionPanelWords.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC;;;;;;;OAOG;IACH,IAAI,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACzC;;;;;OAKG;IACH,OAAO,EAAE;QACP,2EAA2E;QAC3E,IAAI,EAAE,MAAM,CAAC;QACb,0CAA0C;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,yDAAyD;QACzD,SAAS,EAAE,MAAM,CAAC;QAClB,gFAAgF;QAChF,QAAQ,EAAE,MAAM,CAAC;QACjB,sEAAsE;QACtE,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,oFAAoF;IACpF,aAAa,EAAE,MAAM,CAAC;IACtB,sEAAsE;IACtE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjD,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,gFAAgF;AAChF,MAAM,WAAW,sBAAsB;IACrC,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,uEAAuE;AACvE,eAAO,MAAM,sBAAsB,EAAE,oBA8BpC,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,EAAE,qBAerC,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,qBAIrC,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,EAAE,sBAKtC,CAAC"}