@sudobility/music_drawing 0.0.1

package/dist/layout.js

@@ -0,0 +1,362 @@
+import { snappedOnsetTicks } from './display-timing.js';
+export const BASE_MEASURE_WIDTH = 160;
+/**
+ * Width of a measure standing in for a run of silent ones.
+ *
+ * Fixed rather than proportional to the count: a 60-bar rest should not be
+ * thirty times wider than a 2-bar one. It only has to fit the horizontal bar
+ * and a numeral.
+ */
+const MULTI_REST_MEASURE_WIDTH = 320;
+/**
+ * Width budget per drawn onset.
+ *
+ * Measured, not guessed: `Formatter.preCalculateMinTotalWidth` asks 446 units
+ * for a bar of sixteen sixteenths, which is 27.9 each, and the same 27.9
+ * whether or not every one of them carries an accidental. Rounded up to 28, so
+ * a dense bar is given at least what VexFlow will ask for and never has to
+ * overflow into the next measure's space — which would break the shared
+ * barline across tracks.
+ *
+ * A measure with more onsets than the base width comfortably holds grows
+ * proportionally (`max(BASE, onsets * SLOT + PADDING)`), and the count is the
+ * union across every track, so all tracks agree on the shared width.
+ */
+export const NOTE_SLOT_WIDTH = 28;
+/** Breathing room added to a density-derived measure width (start padding + last note's stem/flag overhang + barline clearance). */
+export const DENSE_MEASURE_PADDING = 35;
+/** Extra width reserved on a system's first measure for clef + key signature + time signature. */
+export const SYSTEM_HEADER_WIDTH = 90;
+/**
+ * The least room the music is ever given, whatever the window does.
+ *
+ * Only a guard against a zero or negative budget once the gutter and margins
+ * are taken out of a very narrow viewport. Music this cramped is unreadable,
+ * but it is *there* — better than the right-hand part of every bar being
+ * silently clipped away, which is what a larger floor used to cause.
+ */
+const MIN_CONTENT_WIDTH = 80;
+/** The whole vertical row one track occupies in a system. Exported so the renderer can cull staves against the viewport. */
+export const STAVE_HEIGHT = 100;
+/**
+ * Vertical distance between adjacent staff positions, in logical units — one
+ * line to the space beside it.
+ *
+ * VexFlow spaces its five lines 10 units apart and the renderer does not
+ * override that, so a staff position is half of it. Exported because dragging a
+ * note up and down the staff needs to turn pixels into positions, and deriving
+ * that from `STAVE_HEIGHT` would be wrong: that is the whole row a track is
+ * given, padding included, not the ruled staff.
+ */
+export const STAVE_POSITION_HEIGHT = 5;
+/**
+ * Distance from a track box's top edge down to the stave's **top line**.
+ *
+ * VexFlow reserves headroom above the ruled staff for anything that sits over
+ * it — `space_above_staff_ln: 4` line-spaces, at its 10-unit line distance — so
+ * the `y` a `Stave` is constructed with is not where the music starts. Exported
+ * because the track-info gutter aligns its instrument row to the first line the
+ * reader actually sees, and eyeballing that offset would drift the moment the
+ * stave's options changed.
+ */
+export const STAVE_TOP_LINE_OFFSET = 8 * STAVE_POSITION_HEIGHT;
+const TRACK_GAP = 20;
+const SYSTEM_GAP = 40;
+const LEFT_MARGIN = 10;
+/**
+ * Width reserved at the left of every system for the track-info gutter (track
+ * name, instrument, mute/solo), and the width the app's track editing panel
+ * matches.
+ *
+ * Reserving it here is what makes the gutter's alignment with the staves
+ * structural: it lives in the same coordinate space, so there is nothing to
+ * synchronise. The previous approach positioned a DOM list against reported
+ * geometry and had to be stopped from scrolling independently.
+ */
+export const TRACK_INFO_WIDTH = 220;
+const TOP_MARGIN = 10;
+/**
+ * Height of the measure-number band above each system's top stave (also the
+ * click target for measure selection).
+ *
+ * Systems after the first take it out of `SYSTEM_GAP`, so nothing reflows.
+ * The first system has only `TOP_MARGIN` above it — not enough — so the
+ * effective top margin is raised by this much, which is why `totalHeight`
+ * grows by twice this value (the margin is counted at both ends).
+ */
+export const MEASURE_HEADER_HEIGHT = 18;
+/** Guards against a zero/negative/non-finite zoom breaking division or `context.scale`. */
+export function resolveZoom(zoom) {
+    return zoom > 0 ? zoom : 1;
+}
+/** Tracks to render, in `options.trackIds` order when given (unknown ids are dropped); else score order. */
+function selectTracks(score, options) {
+    if (!options.trackIds || options.trackIds.length === 0) {
+        return score.tracks;
+    }
+    const byId = new Map(score.tracks.map(t => [t.id, t]));
+    return options.trackIds
+        .map(id => byId.get(id))
+        .filter((t) => t !== undefined);
+}
+/**
+ * Greedily groups measure indices into systems (rows) so each row's total width
+ * fits `maxWidth`.
+ *
+ * `measureWidth` is asked for the width a measure would have *in the position
+ * being considered*, because only the first measure of a system carries the
+ * clef, key and time signature. Packing used to assume every measure might be
+ * that one and add the header to all of them — an upper bound that never
+ * overflowed but routinely left a system a bar short of what it could hold.
+ */
+function groupIntoSystems(measureCount, measureWidth, maxWidth) {
+    const systems = [];
+    let current = [];
+    let currentWidth = 0;
+    for (let i = 0; i < measureCount; i += 1) {
+        const width = measureWidth(i, current.length === 0);
+        if (current.length > 0 && currentWidth + width > maxWidth) {
+            systems.push(current);
+            current = [];
+            currentWidth = measureWidth(i, true);
+        }
+        else {
+            currentWidth += width;
+        }
+        current.push(i);
+    }
+    if (current.length > 0)
+        systems.push(current);
+    return systems;
+}
+/**
+ * Computes per-track, per-measure stave boxes and per-system outer bounds
+ * (for brace/connector drawing), all in LOGICAL (unscaled) units — see the
+ * module doc. Assumes all selected tracks share the same measure count; a
+ * track with fewer measures than the score's max simply has no box for the
+ * missing trailing measures (defensive, not expected in practice — spec §4
+ * keeps tracks aligned to the same measure grid).
+ */
+export function computeLayout(score, options) {
+    const zoom = resolveZoom(options.zoom);
+    const tracks = selectTracks(score, options);
+    const measureCount = tracks.reduce((max, t) => Math.max(max, t.measures.length), 0);
+    const headerWidth = SYSTEM_HEADER_WIDTH;
+    const staveHeight = STAVE_HEIGHT;
+    const trackGap = TRACK_GAP;
+    const systemGap = SYSTEM_GAP;
+    // The gutter's reserved column is part of the left margin, so turning the
+    // gutter off has to shrink the margin too — otherwise the space stays blank
+    // and the music is simply indented for no reason.
+    const showTrackInfo = options.showTrackInfo ?? true;
+    const leftMargin = LEFT_MARGIN + (showTrackInfo ? TRACK_INFO_WIDTH : 0);
+    // Trailing margin is the plain page margin, NOT `leftMargin`: that one
+    // carries the track-info gutter's reserved column, and mirroring it on the
+    // right padded every page-mode layout with a phantom TRACK_INFO_WIDTH of
+    // empty space — enough to push `totalWidth` past the viewport and give page
+    // mode a horizontal scrollbar it should never have had.
+    const rightMargin = LEFT_MARGIN;
+    const topMargin = TOP_MARGIN + MEASURE_HEADER_HEIGHT;
+    // Density-aware per-measure widths (see NOTE_SLOT_WIDTH's doc): one shared
+    // width per measure index across every track, from the densest voice.
+    const contentWidths = Array.from({ length: measureCount }, (_, measureIndex) => {
+        // Count the distinct onsets the measure will actually draw, across every
+        // track — that is one tick context each, and VexFlow's minimum width is
+        // proportional to how many there are.
+        //
+        // Not `voice.events.length`: recorded events and drawn tickables are not
+        // the same thing. A drum bar of 37 hits three ticks apart draws as 16 once
+        // they are chorded, and giving it width for 37 left it half empty and
+        // pushed every other bar onto its own line.
+        const onsets = new Set();
+        for (const track of tracks) {
+            const measure = track.measures[measureIndex];
+            if (!measure)
+                continue;
+            for (const voice of measure.voices) {
+                for (const tick of snappedOnsetTicks(voice.events, measure.startTick, measure.durationTicks, score.ppq)) {
+                    onsets.add(tick);
+                }
+            }
+        }
+        const maxEvents = onsets.size;
+        // A collapsed measure's width comes from what it draws — one bar and a
+        // number — not from the events it replaced, of which there are none.
+        const collapsed = tracks.some(track => track.measures[measureIndex]?.multiMeasureRestCount !== undefined);
+        if (collapsed)
+            return MULTI_REST_MEASURE_WIDTH;
+        return Math.max(BASE_MEASURE_WIDTH, maxEvents * NOTE_SLOT_WIDTH + DENSE_MEASURE_PADDING);
+    });
+    const widthOf = (measureIndex, isFirstInSystem) => (contentWidths[measureIndex] ?? BASE_MEASURE_WIDTH) +
+        (isFirstInSystem ? headerWidth : 0);
+    // `options.width` is a screen-pixel budget; convert to the equivalent
+    // logical-unit budget by dividing out zoom (a more zoomed-in view fits
+    // fewer logical pixels in the same screen width) before packing systems.
+    //
+    //
+    // Both margins come out of the budget, so a packed system's right edge lands
+    // at or inside the viewport and page mode's `totalWidth` below can be exactly
+    // that. What is left is what the music itself may occupy.
+    //
+    // This used to be floored at what one measure needs *with* its margins, which
+    // meant that below about 530 logical units the layout simply stopped
+    // shrinking — and since page mode hides horizontal overflow, everything past
+    // the viewport was permanently invisible. A narrow window clipped it, and so
+    // did zooming in, which divides the same window by more. The floor here is
+    // only a guard against a zero or negative budget; the per-system scaling
+    // below is what keeps the music inside it.
+    const contentBudget = options.layoutMode === 'continuous'
+        ? Number.POSITIVE_INFINITY
+        : Math.max(MIN_CONTENT_WIDTH, options.width / zoom - leftMargin - rightMargin);
+    const systemsOfIndices = groupIntoSystems(measureCount, widthOf, contentBudget);
+    const rowHeight = (count) => count > 0 ? count * staveHeight + Math.max(0, count - 1) * trackGap : 0;
+    const trackRowHeight = rowHeight(tracks.length);
+    const trackLayouts = tracks.map(track => ({
+        track,
+        measures: [],
+    }));
+    const systems = [];
+    let maxSystemRight = 0;
+    systemsOfIndices.forEach((measureIndices, systemIndex) => {
+        const yTop = topMargin + systemIndex * (trackRowHeight + systemGap);
+        const yBottom = yTop + trackRowHeight;
+        /**
+         * Extra width spread across this system's measures so it reaches the
+         * margin — what engravers call justification.
+         *
+         * Without it a system stops wherever the next measure would not have fit,
+         * leaving up to a whole measure's width blank at the right. That reads as
+         * a mistake on paper and no better on screen.
+         *
+         * The last system is deliberately left at its natural width: a final line
+         * of two bars stretched across the page looks worse than a short one.
+         * Continuous mode is never justified — it has no right margin to reach.
+         */
+        const naturalWidth = measureIndices.reduce((sum, index, position) => sum + widthOf(index, position === 0), 0);
+        const isLastSystem = systemIndex === systemsOfIndices.length - 1;
+        // Where this system's right edge should land.
+        //
+        // Too wide always shrinks, whatever the mode and whichever system it is:
+        // page mode hides horizontal overflow, so a system that does not fit is not
+        // merely ugly, it is partly unreadable — which is what happened to a bar
+        // dense enough to exceed the budget on its own. Only *stretching* is
+        // optional, and stays as it was: page mode, and not the final system.
+        const target = naturalWidth > contentBudget ||
+            (options.layoutMode === 'page' && !isLastSystem)
+            ? contentBudget
+            : naturalWidth;
+        // Shared out in proportion to what each measure already occupies, so a
+        // dense bar keeps its extra room rather than a sparse one being padded to
+        // match it — and, shrinking, gives up room in proportion too.
+        const scale = naturalWidth > 0 ? target / naturalWidth : 1;
+        let cursorX = leftMargin;
+        measureIndices.forEach((measureIndex, positionInSystem) => {
+            const isFirstInSystem = positionInSystem === 0;
+            const naturalMeasureWidth = widthOf(measureIndex, isFirstInSystem);
+            // Rounded to whole units, then the last measure absorbs whatever the
+            // rounding lost — otherwise the system lands a pixel or two short and
+            // the final barline never quite meets the margin.
+            const isLastInSystem = positionInSystem === measureIndices.length - 1;
+            const width = isLastInSystem
+                ? leftMargin + target - cursorX
+                : naturalMeasureWidth * scale;
+            tracks.forEach((track, trackIndex) => {
+                if (measureIndex >= track.measures.length)
+                    return;
+                const y = yTop + trackIndex * (staveHeight + trackGap);
+                trackLayouts[trackIndex].measures.push({
+                    measureIndex,
+                    isFirstInSystem,
+                    box: { x: cursorX, y, width, height: staveHeight },
+                });
+            });
+            cursorX += width;
+        });
+        maxSystemRight = Math.max(maxSystemRight, cursorX);
+        systems.push({
+            measureIndices,
+            xLeft: leftMargin,
+            xRight: cursorX,
+            gutterTop: yTop - MEASURE_HEADER_HEIGHT,
+            yTop,
+            yBottom,
+        });
+    });
+    const totalHeight = systems.length > 0
+        ? systems[systems.length - 1].yBottom + topMargin
+        : topMargin * 2;
+    // Both terms are logical units here: `maxSystemRight` is logical by
+    // construction, and `options.width` (a screen-pixel budget) is divided by
+    // zoom to match, same as `logicalAvailableWidth` above.
+    const totalWidth = Math.max(maxSystemRight + rightMargin, options.layoutMode === 'page' ? options.width / zoom : 0);
+    return { tracks, trackLayouts, systems, totalWidth, totalHeight };
+}
+/**
+ * The stave box for `measureIndex` on `plan.trackLayouts[trackIndex]`
+ * (logical units), or `null` if that track/measure index isn't present in
+ * the plan. Lets a caller locate a measure's position (e.g. to scroll to
+ * it during playback) directly from layout, independent of whether that
+ * measure fell inside the drawn window of a windowed canvas render pass
+ * (system boxes never shift with what a given frame chooses to draw).
+ */
+export function boxForMeasureIndex(plan, trackIndex, measureIndex) {
+    const trackLayout = plan.trackLayouts[trackIndex];
+    if (!trackLayout)
+        return null;
+    return (trackLayout.measures.find(m => m.measureIndex === measureIndex)?.box ?? null);
+}
+/** Binary search over the y-sorted `plan.systems` for the system containing logical `y`; `null` in inter-system gaps or outside the score. O(log n). */
+export function systemAtY(plan, y) {
+    const systems = plan.systems;
+    let lo = 0;
+    let hi = systems.length - 1;
+    while (lo <= hi) {
+        const mid = (lo + hi) >> 1;
+        const s = systems[mid];
+        if (y < s.yTop)
+            hi = mid - 1;
+        else if (y > s.yBottom)
+            lo = mid + 1;
+        else
+            return s;
+    }
+    return null;
+}
+/**
+ * Binary search over `system`'s x-sorted measures (first track's layouts)
+ * for the measure containing logical `x`, clamping x into the system's
+ * measure span (clicks left of the clef resolve to the first measure,
+ * right of the last barline to the last). `null` only when the system
+ * resolves to no measure layouts. O(log n).
+ *
+ * Indexing note: `computeLayout` pushes one `MeasureLayout` per measure in
+ * ascending order for every track that has the measure, so for track 0
+ * `trackLayouts[0].measures[i].measureIndex === i` — direct indexing by
+ * `system.measureIndices` values is safe (and bounds-guarded here anyway).
+ */
+export function measureAtXInSystem(plan, system, x) {
+    const measures = plan.trackLayouts[0]?.measures;
+    if (!measures || system.measureIndices.length === 0)
+        return null;
+    const first = measures[system.measureIndices[0]];
+    const last = measures[system.measureIndices[system.measureIndices.length - 1]];
+    if (!first || !last)
+        return null;
+    const clamped = Math.min(Math.max(x, first.box.x), last.box.x + last.box.width - 1e-9);
+    let lo = 0;
+    let hi = system.measureIndices.length - 1;
+    while (lo <= hi) {
+        const mid = (lo + hi) >> 1;
+        const m = measures[system.measureIndices[mid]];
+        if (!m)
+            return null;
+        if (clamped < m.box.x)
+            hi = mid - 1;
+        else if (clamped >= m.box.x + m.box.width)
+            lo = mid + 1;
+        else
+            return m;
+    }
+    return last;
+}
+//# sourceMappingURL=layout.js.map

package/dist/layout.js.map

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

package/dist/measure-content.d.ts

@@ -0,0 +1,114 @@
+/**
+ * Shared VexFlow measure-content builders (spec §7, §26): turn one domain
+ * measure into its `Stave`/`Voice`s/`Beam`s, and a track's accumulated
+ * note channels into `StaveTie`s. Consumed by `canvas-renderer.ts` per
+ * drawn system; kept renderer-agnostic (nothing here draws or touches a
+ * context/backend).
+ *
+ * Pure adapter: no store/React imports (spec §3, §37).
+ */
+import { Beam, MultiMeasureRest, Stave, Curve, StaveHairpin, StaveLine, TextBracket, StaveTie, Tuplet, Voice } from 'vexflow';
+import type { StaveNote } from 'vexflow';
+import type { Measure, Track } from '@sudobility/music_types';
+import type { NoteMeta } from './convert.js';
+import type { MeasureLayout } from './layout.js';
+/**
+ * Glyph scale for cue notes. VexFlow's default is 38; grace notes use a
+ * comparable reduction. Small enough to read as "not yours" at a glance,
+ * large enough to read at all.
+ */
+export declare const CUE_GLYPH_SCALE = 26;
+/** Cue labels are small italic by convention, and must not crowd the bar number. */
+export declare const CUE_LABEL_FONT_SIZE = 9;
+/** A single note/rest "channel" (spec §25 voice-ordinal convention, mirrored from `domain/score/ties.ts`) accumulated across a track's measures, for cross-measure/cross-decomposition tie detection. */
+export type Channel = Array<{
+    note: StaveNote;
+    meta: NoteMeta;
+}>;
+/** Builds one measure's `Stave`, its VexFlow `Voice`s, and its beams; records notes into `channels` for tie building. */
+export declare function buildMeasureContent(measure: Measure, track: Track, 
+/**
+ * This measure's position in `track.measures`.
+ *
+ * Passed in rather than read off `measure.index`: a print-only part collapses
+ * runs of rests, which shortens the array while every surviving measure keeps
+ * its original `index`, so the two stop agreeing. The caller iterates the
+ * array and knows the truth.
+ */
+measureIndex: number, placement: MeasureLayout, prevMeasure: Measure | undefined, 
+/** The bar after this one, for deriving where a volta bracket ends. */
+nextMeasure: Measure | undefined, ppq: number, channels: Map<number, Channel>, allMetas: NoteMeta[]): {
+    stave: Stave;
+    voices: Voice[];
+    beams: Beam[];
+    /** Tuplet brackets and their numbers, drawn after the voices like beams. */
+    tuplets: Tuplet[];
+    multiMeasureRest?: MultiMeasureRest;
+};
+/**
+ * Ties every adjacent pair of notes in a voice-ordinal channel whose keys
+ * actually match by pitch — covers both cross-barline ties and same-measure
+ * duration-decomposition ties with one mechanism. Matches by pitch, never
+ * by array index/adjacency (a chord where only one of several members ties
+ * forward must produce exactly one `StaveTie`, on the correct key indices
+ * on each side — see `KeyTie`'s doc in convert.ts and
+ * `domain/score/ties.ts`'s `findForwardPartner`/`findBackwardPartner`,
+ * which requires the same tick/pitch/tie-flag matching for the same
+ * reason: a same-tick note sharing a channel by coincidence must not be
+ * spliced in).
+ */
+export declare function buildTies(channel: Channel, 
+/**
+ * Whether a note was actually drawn this frame.
+ *
+ * A tie is positioned from its two notes' Y values, which only exist once
+ * the note has been drawn — so a tie to a note on a culled (off-screen)
+ * stave throws `NoYValues` inside VexFlow. Filtering here rather than
+ * catching there is what keeps one such pair from taking the rest of the
+ * channel's ties with it.
+ */
+isDrawn?: (note: StaveNote) => boolean): StaveTie[];
+/**
+ * Draws each phrase mark in a channel as one curve, start note to stop note.
+ *
+ * Unlike `buildTies` this does not work on adjacent pairs: a slur spans a run
+ * of notes, and the pair to join is "the note that opened it" and "the next
+ * one that closes it". Matching is by order rather than by pitch for the same
+ * reason — a slur groups different pitches, which is what distinguishes it
+ * from a tie.
+ *
+ * `isDrawn` filters the same hazard ties have: a curve is positioned from its
+ * two notes' Y values, which only exist once they have been drawn, so one
+ * reaching a culled off-screen stave would throw inside VexFlow.
+ */
+/**
+ * Draws each hairpin in a channel as one wedge, opening note to closing note.
+ *
+ * `buildSlurs`' structure exactly, because a hairpin is the same kind of span:
+ * opened by one note, closed by a later one, matched in order rather than by
+ * pitch. It carries the same culling hazard too — a wedge is positioned from
+ * its two notes' Y values, which only exist once they have been drawn, so one
+ * reaching a culled off-screen stave throws inside VexFlow.
+ *
+ * Below the stave, where the dynamics already sit, so a level and the change
+ * between two levels read as one system rather than two.
+ */
+export declare function buildHairpins(channel: Channel, isDrawn?: (note: StaveNote) => boolean): StaveHairpin[];
+/**
+ * The octave brackets in a channel, one `TextBracket` per span.
+ *
+ * Above the stave for `8va`/`15ma` and below for the `b` forms, which is where
+ * the displacement points. Culled like the curves: a bracket is positioned
+ * from its two notes, so one reaching an off-screen stave throws.
+ */
+export declare function buildOttavas(channel: Channel, isDrawn?: (note: StaveNote) => boolean): TextBracket[];
+/**
+ * The slides in a channel, drawn as a straight line between the two notes.
+ *
+ * VexFlow has no `Glissando`; a `StaveLine` between the notes is what its own
+ * examples use, and it is what a glissando is on the page — a line from one
+ * notehead to the next.
+ */
+export declare function buildGlissandos(channel: Channel, isDrawn?: (note: StaveNote) => boolean): StaveLine[];
+export declare function buildSlurs(channel: Channel, isDrawn?: (note: StaveNote) => boolean): Curve[];
+//# sourceMappingURL=measure-content.d.ts.map

package/dist/measure-content.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-content.d.ts","sourceRoot":"","sources":["../src/measure-content.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAEL,IAAI,EACJ,gBAAgB,EAChB,KAAK,EAGL,KAAK,EAGL,YAAY,EACZ,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EAIN,KAAK,EACN,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,SAAS,CAAC;AAExD,OAAO,KAAK,EAEV,OAAO,EAGP,KAAK,EACN,MAAM,yBAAyB,CAAC;AAWjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC,oFAAoF;AACpF,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAUrC,yMAAyM;AACzM,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAiEjE,yHAAyH;AACzH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK;AACZ;;;;;;;GAOG;AACH,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,OAAO,GAAG,SAAS;AAChC,uEAAuE;AACvE,WAAW,EAAE,OAAO,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,QAAQ,EAAE,QAAQ,EAAE,GACnB;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAoTA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO;AAChB;;;;;;;;GAQG;AACH,OAAO,GAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAoB,GACjD,QAAQ,EAAE,CAsCZ;AAED;;;;;;;;;;;;GAYG;AACH;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAoB,GACjD,YAAY,EAAE,CA8BhB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAoB,GACjD,WAAW,EAAE,CAgCf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAoB,GACjD,SAAS,EAAE,CAyBb;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAoB,GACjD,KAAK,EAAE,CAoBT"}